From 946cac440ca142a91f8b418361dfb6999656e955 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 22 Feb 2012 19:25:54 +0000 Subject: [PATCH] [USBEHCI] [USBOHCI] [USBUHCI] - Fix retrieving configuration index for real - Thanks to Thomas Faber svn path=/trunk/; revision=55812 --- reactos/drivers/usb/usbehci/usb_device.cpp | 4 ++-- reactos/drivers/usb/usbohci/usb_device.cpp | 4 ++-- reactos/drivers/usb/usbuhci/usb_device.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/drivers/usb/usbehci/usb_device.cpp b/reactos/drivers/usb/usbehci/usb_device.cpp index 863c6c1e10a..0f587d0b2c0 100644 --- a/reactos/drivers/usb/usbehci/usb_device.cpp +++ b/reactos/drivers/usb/usbehci/usb_device.cpp @@ -1056,7 +1056,7 @@ CUSBDevice::SelectConfiguration( // 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 @@ CUSBDevice::SelectConfiguration( if (!Found) { - DPRINT1("[USBUHCI] invalid configuration index %lu\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("[USBUHCI] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } diff --git a/reactos/drivers/usb/usbohci/usb_device.cpp b/reactos/drivers/usb/usbohci/usb_device.cpp index 0428f152218..f7cceb60009 100644 --- a/reactos/drivers/usb/usbohci/usb_device.cpp +++ b/reactos/drivers/usb/usbohci/usb_device.cpp @@ -1115,7 +1115,7 @@ CUSBDevice::SelectConfiguration( // 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 @@ CUSBDevice::SelectConfiguration( if (!Found) { - DPRINT1("[USBUHCI] invalid configuration index %lu\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("[USBUHCI] invalid configuration index %lu\n", ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } diff --git a/reactos/drivers/usb/usbuhci/usb_device.cpp b/reactos/drivers/usb/usbuhci/usb_device.cpp index 2af0fc2c7a7..8dadc52468f 100644 --- a/reactos/drivers/usb/usbuhci/usb_device.cpp +++ b/reactos/drivers/usb/usbuhci/usb_device.cpp @@ -1155,7 +1155,7 @@ CUSBDevice::SelectConfiguration( // 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 @@ CUSBDevice::SelectConfiguration( if (!Found) { - DPRINT1("[USBUHCI] invalid configuration index %lu\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("[USBUHCI] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; }