From 5c6676a9a6b1e6cc3a81e852171a1a217d5dd910 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Jan 2012 23:03:27 +0000 Subject: [PATCH] [USB-BRINGUP-TRUNK] - Fix hidparser build - Based on a patch from igorko svn path=/branches/usb-bringup-trunk/; revision=55030 --- lib/drivers/hidparser/api.c | 6 +++--- lib/drivers/hidparser/hidparser.c | 6 ++++-- lib/drivers/hidparser/hidparser.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/drivers/hidparser/api.c b/lib/drivers/hidparser/api.c index 6c39d10ce2c..6adeab0a169 100644 --- a/lib/drivers/hidparser/api.c +++ b/lib/drivers/hidparser/api.c @@ -101,7 +101,7 @@ HidParser_GetReportByType( { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - ULONG ReportCount = 0; + //ULONG ReportCount = 0; // // get parser context @@ -863,7 +863,7 @@ HidParser_GetScaledUsageValueWithReport( PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - ULONG ItemCount = 0; + //ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1017,7 @@ HidParser_DispatchKey( // // is this a key break // - if (KeyAction == HidP_KeyboardBreak) + if (KeyAction == HidP_Keyboard_Break) { // // add break diff --git a/lib/drivers/hidparser/hidparser.c b/lib/drivers/hidparser/hidparser.c index 1a1fce50f6b..21b357ee403 100644 --- a/lib/drivers/hidparser/hidparser.c +++ b/lib/drivers/hidparser/hidparser.c @@ -49,7 +49,7 @@ HidParser_GetCollectionDescription( OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount, ReportCount; + ULONG CollectionCount; ULONG Index; // @@ -678,7 +678,9 @@ HidParser_TranslateUsageAndPagesToI8042ScanCodes( // // process usage // - Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + //Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + UNIMPLEMENTED + Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { diff --git a/lib/drivers/hidparser/hidparser.h b/lib/drivers/hidparser/hidparser.h index 104ceeeb3b6..2e3855784ec 100644 --- a/lib/drivers/hidparser/hidparser.h +++ b/lib/drivers/hidparser/hidparser.h @@ -13,6 +13,7 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include +#include #include #include #include @@ -330,6 +331,7 @@ HIDAPI NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction,