Author: cgutman Date: Sat Jan 21 00:09:55 2012 New Revision: 55035
URL: http://svn.reactos.org/svn/reactos?rev=55035&view=rev Log: [USB-BRINGUP-TRUNK] - Revert r55030
Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h
Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hi... ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jan 21 00:09:55 2012 @@ -101,7 +101,7 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - //ULONG ReportCount = 0; + ULONG ReportCount = 0;
// // get parser context @@ -863,7 +863,7 @@ 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 @@ // // is this a key break // - if (KeyAction == HidP_Keyboard_Break) + if (KeyAction == HidP_KeyboardBreak) { // // add break
Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hi... ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 21 00:09:55 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount; + ULONG CollectionCount, ReportCount; ULONG Index;
// @@ -678,9 +678,7 @@ // // process usage // - //Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); - UNIMPLEMENTED - Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) {
Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hi... ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 21 00:09:55 2012 @@ -13,7 +13,6 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> -#include <ntddkbd.h> #include <hidpddi.h> #include <hidpi.h> #include <debug.h> @@ -331,7 +330,6 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( - IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction,