[ros-diffs] [janderwald] 51490: [USBEHCI_NEW] - Fix SelectConfiguration / SelectInterface - By mjmartin

Author: janderwald
Date: Fri Apr 29 03:17:57 2011
New Revision: 51490

URL: http://svn.reactos.org/svn/reactos?rev=51490&view=rev
Log:
[USBEHCI_NEW]
- Fix SelectConfiguration / SelectInterface
- By mjmartin

Modified:
    branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp
    branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp

Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Fri Apr 29
03:17:57 2011
@@ -1129,7 +1129,7 @@
     //
     RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
     CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION;
-    CtrlSetup.wValue.W = ConfigurationDescriptor->iConfiguration;
+    CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue;
 
     //
     // select configuration
@@ -1214,8 +1214,8 @@
     //
     RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
     CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE;
-    CtrlSetup.wValue.W = InterfaceInfo->AlternateSetting;
-    CtrlSetup.wIndex.W = InterfaceInfo->InterfaceNumber;
+    CtrlSetup.wValue.W =
Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting;
+    CtrlSetup.wIndex.W =
Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber;
     CtrlSetup.bmRequestType.B = 0x01;
 
     //

Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Fri Apr 29
03:17:57 2011
@@ -1190,6 +1190,7 @@
         // release packet descriptor
         //
         m_DmaManager->Release(m_DescriptorPacket,
sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
+        m_DescriptorPacket = 0;
     }
 }