Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HIDUSB]

Browse source 
- Retrieve protocol after configuration has been selected
- Fixes HID regression
See issue #6886 for more details.

svn path=/trunk/; revision=55572
This commit is contained in:
Johannes Anderwald 2012-02-13 11:12:58 +00:00
parent 32157dc192
commit a4870d538f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/drivers/hid/hidusb/hidusb.c
View file

@ -1311,6 +1311,7 @@ Hid_GetProtocol(
// //
DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension;
ASSERT(HidDeviceExtension->InterfaceInfo);
if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1) if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1)
{ {
@ -1487,11 +1488,6 @@ Hid_PnpStart(
// //
Hid_SetIdle(DeviceObject); Hid_SetIdle(DeviceObject);
//
// get protocol
//
Hid_GetProtocol(DeviceObject);
// //
// move to next descriptor // move to next descriptor
// //
@ -1518,6 +1514,11 @@ Hid_PnpStart(
// done // done
// //
DPRINT("[HIDUSB] SelectConfiguration %x\n", Status); DPRINT("[HIDUSB] SelectConfiguration %x\n", Status);
//
// get protocol
//
Hid_GetProtocol(DeviceObject);
return Status; return Status;
} }
@ -1526,6 +1527,11 @@ Hid_PnpStart(
// //
UNIMPLEMENTED UNIMPLEMENTED
ASSERT(FALSE); ASSERT(FALSE);
//
// get protocol
//
Hid_GetProtocol(DeviceObject);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }