[USB-BRINGUP]

- Fix build of hidparse

svn path=/branches/usb-bringup-trunk/; revision=55039

diff --git a/drivers/hid/hidparse/hidparse.c b/drivers/hid/hidparse/hidparse.c
index 68db33a..9e5c6af 100644 (file)
--- a/drivers/hid/hidparse/hidparse.c
+++ b/drivers/hid/hidparse/hidparse.c
@@ -332,11 +332,6 @@ HidP_TranslateUsageAndPagesToI8042ScanCodes(
 {
     HID_PARSER Parser;
 
-    //
-    // sanity check
-    //
-    ASSERT(ReportType == HidP_Input || ReportType == HidP_Output || ReportType == HidP_Feature);
-
     //
     // init parser
     //
@@ -345,7 +340,7 @@ HidP_TranslateUsageAndPagesToI8042ScanCodes(
     //
     // translate usage pages
     //
-    return HidParser_TranslateUsageAndPagesToI8042ScanCodes(Parser, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext);
+    return HidParser_TranslateUsageAndPagesToI8042ScanCodes(&Parser, ChangedUsageList, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext);
 }
 
 

diff --git a/drivers/hid/hidparse/hidparse.h b/drivers/hid/hidparse/hidparse.h
index fa516eb..45202cb 100644 (file)
--- a/drivers/hid/hidparse/hidparse.h
+++ b/drivers/hid/hidparse/hidparse.h
@@ -7,4 +7,5 @@
 #include <hidpi.h>
 #define NDEBUG
 #include <debug.h>
-#include "hidparser.h"
\ No newline at end of file
+#include "hidparser.h"
+#include <stdio.h>
\ No newline at end of file

diff --git a/lib/drivers/hidparser/api.c b/lib/drivers/hidparser/api.c
index 6c39d10..b75dd15 100644 (file)
--- a/lib/drivers/hidparser/api.c
+++ b/lib/drivers/hidparser/api.c
@@ -101,7 +101,6 @@ HidParser_GetReportByType(
 {
     PHID_PARSER_CONTEXT ParserContext;
     ULONG Index;
-    ULONG ReportCount = 0;
 
     //
     // get parser context
@@ -863,7 +862,6 @@ HidParser_GetScaledUsageValueWithReport(
     PHID_PARSER_CONTEXT ParserContext;
     ULONG Index;
     PHID_REPORT Report;
-    ULONG ItemCount = 0;
     USHORT CurrentUsagePage;
     PHID_REPORT_ITEM ReportItem;
     ULONG Data;
@@ -1017,7 +1015,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 1a1fce5..c568cd8 100644 (file)
--- 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;
 
     //

diff --git a/lib/drivers/hidparser/hidparser.h b/lib/drivers/hidparser/hidparser.h
index 104ceee..e5e917e 100644 (file)
--- a/lib/drivers/hidparser/hidparser.h
+++ b/lib/drivers/hidparser/hidparser.h
@@ -330,6 +330,7 @@ HIDAPI
 NTSTATUS
 NTAPI
 HidParser_TranslateUsageAndPagesToI8042ScanCodes(
+   IN PHID_PARSER Parser,
    IN PUSAGE_AND_PAGE  ChangedUsageList,
    IN ULONG  UsageListLength,
    IN HIDP_KEYBOARD_DIRECTION  KeyAction,
@@ -418,6 +419,16 @@ HidParser_InitializeReportForID(
   IN OUT PCHAR  Report,
   IN ULONG  ReportLength);
 
+
+HIDPARSER_STATUS
+HidParser_TranslateUsage(
+    IN PHID_PARSER Parser,
+    IN USAGE Usage,
+    IN HIDP_KEYBOARD_DIRECTION  KeyAction,
+    IN OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
+    IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
+    IN PVOID  InsertCodesContext);
+
 HIDAPI
 NTSTATUS
 NTAPI

diff --git a/lib/drivers/hidparser/parser.h b/lib/drivers/hidparser/parser.h
index 3519530..489ad23 100644 (file)
--- a/lib/drivers/hidparser/parser.h
+++ b/lib/drivers/hidparser/parser.h
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <pshpack1.h>
 #include "hidparser.h"
+#include <ntddkbd.h>
 
  /*
   * Copyright 2007, Haiku, Inc. All Rights Reserved.