[ros-diffs] [janderwald] 55812: [USBEHCI] [USBOHCI] [USBUHCI] - Fix retrieving configuration index for real - Thanks to Thomas Faber

Author: janderwald
Date: Wed Feb 22 19:25:54 2012
New Revision: 55812

URL: http://svn.reactos.org/svn/reactos?rev=55812&view=rev
Log:
[USBEHCI] [USBOHCI] [USBUHCI]
- Fix retrieving configuration index for real
- Thanks to Thomas Faber

Modified:
    trunk/reactos/drivers/usb/usbehci/usb_device.cpp
    trunk/reactos/drivers/usb/usbohci/usb_device.cpp
    trunk/reactos/drivers/usb/usbuhci/usb_device.cpp

Modified: trunk/reactos/drivers/usb/usbehci/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_de…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] Wed Feb 22 19:25:54
2012
@@ -1056,7 +1056,7 @@
         //
         for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++)
         {
-            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->iConfiguration ==
ConfigurationDescriptor->iConfiguration)
+            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bConfigurationValue ==
ConfigurationDescriptor->bConfigurationValue)
             {
                 //
                 // found configuration index
@@ -1068,7 +1068,7 @@
 
         if (!Found)
         {
-            DPRINT1("[USBUHCI] invalid configuration index %lu\n",
ConfigurationDescriptor->iConfiguration);
+            DPRINT1("[USBUHCI] invalid configuration value %lu\n",
ConfigurationDescriptor->bConfigurationValue);
             return STATUS_INVALID_PARAMETER;
         }
 

Modified: trunk/reactos/drivers/usb/usbohci/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_de…
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Wed Feb 22 19:25:54
2012
@@ -1115,7 +1115,7 @@
         //
         for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++)
         {
-            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->iConfiguration ==
ConfigurationDescriptor->iConfiguration)
+            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bConfigurationValue ==
ConfigurationDescriptor->bConfigurationValue)
             {
                 //
                 // found configuration index
@@ -1127,7 +1127,7 @@
 
         if (!Found)
         {
-            DPRINT1("[USBUHCI] invalid configuration index %lu\n",
ConfigurationDescriptor->iConfiguration);
+            DPRINT1("[USBUHCI] invalid configuration index %lu\n",
ConfigurationDescriptor->bConfigurationValue);
             return STATUS_INVALID_PARAMETER;
         }
 

Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de…
==============================================================================
--- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Wed Feb 22 19:25:54
2012
@@ -1155,7 +1155,7 @@
         //
         for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++)
         {
-            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->iConfiguration ==
ConfigurationDescriptor->iConfiguration)
+            if
(m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bConfigurationValue ==
ConfigurationDescriptor->bConfigurationValue)
             {
                 //
                 // found configuration index
@@ -1167,7 +1167,7 @@
 
         if (!Found)
         {
-            DPRINT1("[USBUHCI] invalid configuration index %lu\n",
ConfigurationDescriptor->iConfiguration);
+            DPRINT1("[USBUHCI] invalid configuration value %lu\n",
ConfigurationDescriptor->bConfigurationValue);
             return STATUS_INVALID_PARAMETER;
         }