From 86feb20aad5fcacc50254bd5db649926ac42ffab Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Jan 2012 22:17:32 +0000 Subject: [PATCH] [USB-BRINGUP-TRUNK] - Fix build errors in kbdhid and mouhid svn path=/branches/usb-bringup-trunk/; revision=55025 --- drivers/hid/kbdhid/kbdhid.c | 4 ++-- drivers/hid/mouhid/mouhid.c | 4 ++-- drivers/hid/mouhid/mouhid.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/hid/kbdhid/kbdhid.c b/drivers/hid/kbdhid/kbdhid.c index d2d4866bf6d..189725a7df3 100644 --- a/drivers/hid/kbdhid/kbdhid.c +++ b/drivers/hid/kbdhid/kbdhid.c @@ -42,7 +42,7 @@ KbdHid_InsertScanCodes( IN PCHAR NewScanCodes, IN ULONG Length) { - KEYBOARD_INPUT_DATA InputData; + //KEYBOARD_INPUT_DATA InputData; ULONG Index; for(Index = 0; Index < Length; Index++) @@ -563,7 +563,7 @@ KbdHid_StartDevice( /* init input report*/ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); diff --git a/drivers/hid/mouhid/mouhid.c b/drivers/hid/mouhid/mouhid.c index b61af2feb3a..3b1ecacc46c 100644 --- a/drivers/hid/mouhid/mouhid.c +++ b/drivers/hid/mouhid/mouhid.c @@ -648,7 +648,7 @@ MouHid_StartDevice( DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ - if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) + if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) { /* not supported */ ExFreePool(PreparsedData); @@ -658,7 +658,7 @@ MouHid_StartDevice( /* init input report*/ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); diff --git a/drivers/hid/mouhid/mouhid.h b/drivers/hid/mouhid/mouhid.h index 95461734fc9..1f742ccc22a 100644 --- a/drivers/hid/mouhid/mouhid.h +++ b/drivers/hid/mouhid/mouhid.h @@ -86,7 +86,7 @@ typedef struct // // input report buffer // - PUCHAR Report; + PCHAR Report; // // input report length