Attachment #28593 for bug #44609

View | Details | Raw Unified | Return to bug 44609
Collapse All | Expand All

Lines 63-68 Link Here

(-)rioutil-1.4.2b/include/usbdrv.h (-2 / +2 lines)
63		63
64	/* --------------------------------------------------------------------- */	64	/* --------------------------------------------------------------------- */
65		65
		66	#ifndef __LINUX_USB_CH9_H
66	struct usb_device_descriptor {	67	struct usb_device_descriptor {
67	u_int8_t bLength;	68	u_int8_t bLength;
68	u_int8_t bDescriptorType;	69	u_int8_t bDescriptorType;
Lines 79-86 Link Here
79	u_int8_t iSerialNumber;	80	u_int8_t iSerialNumber;
80	u_int8_t bNumConfigurations;	81	u_int8_t bNumConfigurations;
81	};	82	};
82		83	#endif /* __LINUX_USB_CH9_H */
83	//#define USB_DT_DEVICE_SIZE sizeof(struct usb_device_descriptor)
84		84
85	/* --------------------------------------------------------------------- */	85	/* --------------------------------------------------------------------- */
86		86

Lines 84-97 Link Here

(-)rioutil-1.4.2b/librioutil/usbdrvlinux.c (+12 lines)
84	fprintf(f, " Length = %2d%s\n", desc->bLength,	84	fprintf(f, " Length = %2d%s\n", desc->bLength,
85	desc->bLength == USB_DT_DEVICE_SIZE ? "" : " (!!!)");	85	desc->bLength == USB_DT_DEVICE_SIZE ? "" : " (!!!)");
86	fprintf(f, " DescriptorType = %02x\n", desc->bDescriptorType);	86	fprintf(f, " DescriptorType = %02x\n", desc->bDescriptorType);
		87	#ifdef __LINUX_USB_CH9_H
		88	fprintf(f, " USB version = %x\n",
		89	desc->bcdUSB);
		90	fprintf(f, " Vendor:Product = %04x:%04x\n",
		91	desc->idVendor, desc->idProduct);
		92	#else
87	fprintf(f, " USB version = %x.%02x\n",	93	fprintf(f, " USB version = %x.%02x\n",
88	desc->bcdUSB[1], desc->bcdUSB[0]);	94	desc->bcdUSB[1], desc->bcdUSB[0]);
89	fprintf(f, " Vendor:Product = %02x%02x:%02x%02x\n",	95	fprintf(f, " Vendor:Product = %02x%02x:%02x%02x\n",
90	desc->idVendor[1], desc->idVendor[0], desc->idProduct[1], desc->idProduct[0]);	96	desc->idVendor[1], desc->idVendor[0], desc->idProduct[1], desc->idProduct[0]);
		97	#endif
91	fprintf(f, " MaxPacketSize0 = %d\n", desc->bMaxPacketSize0);	98	fprintf(f, " MaxPacketSize0 = %d\n", desc->bMaxPacketSize0);
92	fprintf(f, " NumConfigurations = %d\n", desc->bNumConfigurations);	99	fprintf(f, " NumConfigurations = %d\n", desc->bNumConfigurations);
		100	#ifdef __LINUX_USB_CH9_H
		101	fprintf(f, " Device version = %x\n",
		102	desc->bcdDevice);
		103	#else
93	fprintf(f, " Device version = %x.%02x\n",	104	fprintf(f, " Device version = %x.%02x\n",
94	desc->bcdDevice[1], desc->bcdDevice[0]);	105	desc->bcdDevice[1], desc->bcdDevice[0]);
		106	#endif
95	fprintf(f, " Device Class:SubClass:Protocol = %02x:%02x:%02x\n",	107	fprintf(f, " Device Class:SubClass:Protocol = %02x:%02x:%02x\n",
96	desc->bDeviceClass, desc->bDeviceSubClass, desc->bDeviceProtocol);	108	desc->bDeviceClass, desc->bDeviceSubClass, desc->bDeviceProtocol);
97	switch (desc->bDeviceClass) {	109	switch (desc->bDeviceClass) {

Return to bug 44609