[ros-diffs] [cgutman] 55030: [USB-BRINGUP-TRUNK] - Fix hidparser build - Based on a patch from igorko

[cgutman at svn.reactos.org]

Author: cgutman
Date: Fri Jan 20 23:03:27 2012
New Revision: 55030

URL: http://svn.reactos.org/svn/reactos?rev=55030&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Fix hidparser build
- Based on a patch from igorko

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/hidparser/api.c?rev=55030&r1=55029&r2=55030&view=diff
==============================================================================
--- 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] Fri Jan 20 23:03:27 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_KeyboardBreak)
+        if (KeyAction == HidP_Keyboard_Break)
         {
             //
             // 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/hidparser/hidparser.c?rev=55030&r1=55029&r2=55030&view=diff
==============================================================================
--- 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] Fri Jan 20 23:03:27 2012
@@ -49,7 +49,7 @@
     OUT PHIDP_DEVICE_DESC DeviceDescription)
 {
     HIDPARSER_STATUS ParserStatus;
-    ULONG CollectionCount, ReportCount;
+    ULONG CollectionCount;
     ULONG Index;
 
     //
@@ -678,7 +678,9 @@
             //
             // 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)
         {

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h?rev=55030&r1=55029&r2=55030&view=diff
==============================================================================
--- 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] Fri Jan 20 23:03:27 2012
@@ -13,6 +13,7 @@
 #define _HIDPI_
 #define _HIDPI_NO_FUNCTION_MACROS_
 #include <ntddk.h>
+#include <ntddkbd.h>
 #include <hidpddi.h>
 #include <hidpi.h>
 #include <debug.h>
@@ -330,6 +331,7 @@
 NTSTATUS
 NTAPI
 HidParser_TranslateUsageAndPagesToI8042ScanCodes(
+   IN PHID_PARSER Parser,
    IN PUSAGE_AND_PAGE  ChangedUsageList,
    IN ULONG  UsageListLength,
    IN HIDP_KEYBOARD_DIRECTION  KeyAction,