- Fix build 
[HIDUSB]
- Fix warnings

svn path=/trunk/; revision=59219
This commit is contained in:
Johannes Anderwald 2013-06-15 06:34:38 +00:00
parent 32a23aa9ab
commit 24b5b19981
2 changed files with 3 additions and 23 deletions

View file

@ -421,8 +421,6 @@ HidUsb_ReadReportCompletion(
IN PIRP Irp, IN PIRP Irp,
IN PVOID Context) IN PVOID Context)
{ {
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension;
PURB Urb; PURB Urb;
PHID_USB_RESET_CONTEXT ResetContext; PHID_USB_RESET_CONTEXT ResetContext;
@ -468,12 +466,6 @@ HidUsb_ReadReportCompletion(
return STATUS_CONTINUE_COMPLETION; return STATUS_CONTINUE_COMPLETION;
} }
//
// get device extension
//
DeviceExtension = DeviceObject->DeviceExtension;
HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
// //
// allocate reset context // allocate reset context
// //
@ -971,7 +963,6 @@ Hid_DispatchUrb(
{ {
PIRP Irp; PIRP Irp;
KEVENT Event; KEVENT Event;
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension;
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;
@ -986,7 +977,6 @@ Hid_DispatchUrb(
// get device extension // get device extension
// //
DeviceExtension = DeviceObject->DeviceExtension; DeviceExtension = DeviceObject->DeviceExtension;
HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
// //
// build irp // build irp
@ -1374,17 +1364,9 @@ NTSTATUS
Hid_SetIdle( Hid_SetIdle(
IN PDEVICE_OBJECT DeviceObject) IN PDEVICE_OBJECT DeviceObject)
{ {
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension;
PURB Urb; PURB Urb;
NTSTATUS Status; NTSTATUS Status;
//
// get device extension
//
DeviceExtension = DeviceObject->DeviceExtension;
HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
// //
// allocate urb // allocate urb
// //
@ -1443,7 +1425,6 @@ Hid_GetProtocol(
PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension;
PURB Urb; PURB Urb;
NTSTATUS Status;
UCHAR Protocol[1]; UCHAR Protocol[1];
// //
@ -1494,10 +1475,11 @@ Hid_GetProtocol(
1, 1,
NULL); NULL);
Protocol[0] = 0xFF; Protocol[0] = 0xFF;
// //
// dispatch urb // dispatch urb
// //
Status = Hid_DispatchUrb(DeviceObject, Urb); Hid_DispatchUrb(DeviceObject, Urb);
// //
// free urb // free urb
@ -1706,7 +1688,6 @@ HidPnp(
{ {
NTSTATUS Status; NTSTATUS Status;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension;
KEVENT Event; KEVENT Event;
@ -1714,7 +1695,6 @@ HidPnp(
// get device extension // get device extension
// //
DeviceExtension = DeviceObject->DeviceExtension; DeviceExtension = DeviceObject->DeviceExtension;
HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
// //
// get current stack location // get current stack location

View file

@ -775,7 +775,7 @@ MouHid_StartDevice(
HID_COLLECTION_INFORMATION Information; HID_COLLECTION_INFORMATION Information;
PVOID PreparsedData; PVOID PreparsedData;
HIDP_CAPS Capabilities; HIDP_CAPS Capabilities;
ULONG ValueCapsLength; USHORT ValueCapsLength;
HIDP_VALUE_CAPS ValueCaps; HIDP_VALUE_CAPS ValueCaps;
PMOUHID_DEVICE_EXTENSION DeviceExtension; PMOUHID_DEVICE_EXTENSION DeviceExtension;
PUSAGE Buffer; PUSAGE Buffer;