Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI_NEW]

Browse source 
- Fix SelectConfiguration / SelectInterface
- By mjmartin

svn path=/branches/usb-bringup/; revision=51490
This commit is contained in:
Johannes Anderwald 2011-04-29 03:17:57 +00:00
parent 3b6ba2f1d8
commit 20a1892864
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/usbehci_new/usb_device.cpp
View file

@ -1129,7 +1129,7 @@ CUSBDevice::SelectConfiguration(
// //
RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION;
CtrlSetup.wValue.W = ConfigurationDescriptor->iConfiguration; CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue;
// //
// select configuration // select configuration
@ -1214,8 +1214,8 @@ CUSBDevice::SelectInterface(
// //
RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE; CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE;
CtrlSetup.wValue.W = InterfaceInfo->AlternateSetting; CtrlSetup.wValue.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting;
CtrlSetup.wIndex.W = InterfaceInfo->InterfaceNumber; CtrlSetup.wIndex.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber;
CtrlSetup.bmRequestType.B = 0x01; CtrlSetup.bmRequestType.B = 0x01;
// //

1
drivers/usb/usbehci_new/usb_request.cpp
View file

@ -1190,6 +1190,7 @@ CUSBRequest::FreeQueueHead(
// release packet descriptor // release packet descriptor
// //
m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET));
m_DescriptorPacket = 0;
} }
} }