[janderwald] 55825: [USBCCGP] - Print interface details when dumping the function descriptor - Fix bug USBCCG_AppendInterfaceNumber, which is not yet used

Author: janderwald
Date: Thu Feb 23 00:37:41 2012
New Revision: 55825

URL: http://svn.reactos.org/svn/reactos?rev=55825&view=rev
Log:
[USBCCGP]
- Print interface details when dumping the function descriptor
- Fix bug USBCCG_AppendInterfaceNumber, which is not yet used

Modified:
    trunk/reactos/drivers/usb/usbccgp/misc.c
    trunk/reactos/drivers/usb/usbccgp/pdo.c

Modified: trunk/reactos/drivers/usb/usbccgp/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c…
==============================================================================
--- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Thu Feb 23 00:37:41 2012
@@ -215,10 +215,18 @@
 
         for(SubIndex = 0; SubIndex < FunctionDescriptor[Index].NumberOfInterfaces;
SubIndex++)
         {
-            DPRINT1(" Interface %p\n",
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]);
-            DPRINT1(" Interface InterfaceNumber %x\n",
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber);
-            DPRINT1(" Interface Alternate %x\n",
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting );
+            DPRINT1(" Index %lu Interface %p\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]);
+            DPRINT1(" Index %lu Interface InterfaceNumber %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber);
+            DPRINT1(" Index %lu Interface Alternate %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting );
+            DPRINT1(" Index %lu bLength %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bLength);
+            DPRINT1(" Index %lu bDescriptorType %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bDescriptorType);
+            DPRINT1(" Index %lu bInterfaceNumber %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber);
+            DPRINT1(" Index %lu bAlternateSetting %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting);
+            DPRINT1(" Index %lu bNumEndpoints %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bNumEndpoints);
+            DPRINT1(" Index %lu bInterfaceClass %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceClass);
+            DPRINT1(" Index %lu bInterfaceSubClass %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceSubClass);
+            DPRINT1(" Index %lu bInterfaceProtocol %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceProtocol);
+            DPRINT1(" Index %lu iInterface %x\n", SubIndex,
FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface);
         }
     }
-
 }

Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?…
==============================================================================
--- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Feb 23 00:37:41 2012
@@ -163,7 +163,7 @@
 
     while(*DeviceId)
     {
-        StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1;
+        StringLength = swprintf(String, L"%s&MI_%02x", DeviceId,
InterfaceNumber) + 1;
         Length = wcslen(DeviceId) + 1;
         DPRINT("String %p\n", String);