eden-emu/libusb
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Samples: xusb improvements

Browse source 
* update and fix usage details
* make topology and speed printout optional (option -i)
* remove unneeded option -g
This commit is contained in:
Pete Batard 2012-09-03 20:43:18 +01:00
parent 17cede5ab0
commit 8b5ba57e56
2 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
examples/xusb.c
View file

@ -54,6 +54,7 @@
// Global variables // Global variables
bool binary_dump = false; bool binary_dump = false;
bool extra_info = false;
const char* binary_name = NULL; const char* binary_name = NULL;
static int perr(char const *format, ...) static int perr(char const *format, ...)
@ -759,17 +760,21 @@ static int test_device(uint16_t vid, uint16_t pid)
dev = libusb_get_device(handle); dev = libusb_get_device(handle);
bus = libusb_get_bus_number(dev); bus = libusb_get_bus_number(dev);
if (extra_info) {
r = libusb_get_port_path(NULL, dev, port_path, sizeof(port_path)); r = libusb_get_port_path(NULL, dev, port_path, sizeof(port_path));
if (r > 0) { if (r > 0) {
printf("bus: %d, port path from HCD: %d", bus, port_path[0]); printf("\nDevice properties:\n");
printf(" bus number: %d\n", bus);
printf(" port path: %d", port_path[0]);
for (i=1; i<r; i++) { for (i=1; i<r; i++) {
printf("->%d", port_path[i]); printf("->%d", port_path[i]);
} }
printf("\n"); printf(" (from root hub)\n");
} }
r = libusb_get_device_speed(dev); r = libusb_get_device_speed(dev);
if ((r<0) || (r>4)) r=0; if ((r<0) || (r>4)) r=0;
printf("speed: %s\n", speed_name[r]); printf(" speed: %s\n", speed_name[r]);
}
printf("\nReading device descriptor:\n"); printf("\nReading device descriptor:\n");
CALL_CHECK(libusb_get_device_descriptor(dev, &dev_desc)); CALL_CHECK(libusb_get_device_descriptor(dev, &dev_desc));
@ -933,6 +938,9 @@ int main(int argc, char** argv)
case 'd': case 'd':
debug_mode = true; debug_mode = true;
break; break;
case 'i':
extra_info = true;
break;
case 'b': case 'b':
if ((j+1 >= argc) || (argv[j+1][0] == '-') || (argv[j+1][0] == '/')) { if ((j+1 >= argc) || (argv[j+1][0] == '-') || (argv[j+1][0] == '/')) {
printf(" Option -b requires a file name"); printf(" Option -b requires a file name");
@ -941,8 +949,6 @@ int main(int argc, char** argv)
binary_name = argv[++j]; binary_name = argv[++j];
binary_dump = true; binary_dump = true;
break; break;
case 'g':
break;
case 'j': case 'j':
// OLIMEX ARM-USB-TINY JTAG, 2 channel composite device - 2 interfaces // OLIMEX ARM-USB-TINY JTAG, 2 channel composite device - 2 interfaces
if (!VID && !PID) { if (!VID && !PID) {
@ -1000,16 +1006,17 @@ int main(int argc, char** argv)
} }
if ((show_help) || (argc == 1) || (argc > 7)) { if ((show_help) || (argc == 1) || (argc > 7)) {
printf("usage: %s [-d] [-b file] [-h] [-i] [-j] [-k] [-x] [vid:pid]\n", argv[0]); printf("usage: %s [-h] [-d] [-i] [-k] [-b file] [-j] [-x] [-s] [-p] [vid:pid]\n", argv[0]);
printf(" -h: display usage\n"); printf(" -h : display usage\n");
printf(" -d: enable debug output (if library was compiled with debug enabled)\n"); printf(" -d : enable debug output\n");
printf(" -b: dump Mass Storage first block to binary file\n"); printf(" -i : print topology and speed info\n");
printf(" -g: short generic test (default)\n"); printf(" -j : test composite FTDI based JTAG device\n");
printf(" -k: test generic Mass Storage USB device (using WinUSB)\n"); printf(" -k : test Mass Storage device\n");
printf(" -j: test FTDI based JTAG device (using WinUSB)\n"); printf(" -b file : dump Mass Storage data to file 'file'\n");
printf(" -p: test Sony PS3 SixAxis controller (using WinUSB)\n"); printf(" -p : test Sony PS3 SixAxis controller\n");
printf(" -s: test Microsoft Sidewinder Precision Pro (using HID)\n"); printf(" -s : test Microsoft Sidewinder Precision Pro (HID)\n");
printf(" -x: test Microsoft XBox Controller Type S (using WinUSB)\n"); printf(" -x : test Microsoft XBox Controller Type S\n");
printf("If no option is provided, xusb attempts to run the most appropriate test\n");
return 0; return 0;
} }

2
libusb/version_nano.h
View file

@ -1 +1 @@
#define LIBUSB_NANO 10557 #define LIBUSB_NANO 10558