Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USB-BRINGUP-TRUNK]

Browse source 
- Fix hidparser build
- Based on a patch from igorko

svn path=/branches/usb-bringup-trunk/; revision=55030
This commit is contained in:
Cameron Gutman 2012-01-20 23:03:27 +00:00
parent 9dacc2a9ac
commit 5c6676a9a6
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/drivers/hidparser/api.c
View file

@ -101,7 +101,7 @@ HidParser_GetReportByType(
{ {
PHID_PARSER_CONTEXT ParserContext; PHID_PARSER_CONTEXT ParserContext;
ULONG Index; ULONG Index;
ULONG ReportCount = 0; //ULONG ReportCount = 0;
// //
// get parser context // get parser context
@ -863,7 +863,7 @@ HidParser_GetScaledUsageValueWithReport(
PHID_PARSER_CONTEXT ParserContext; PHID_PARSER_CONTEXT ParserContext;
ULONG Index; ULONG Index;
PHID_REPORT Report; PHID_REPORT Report;
ULONG ItemCount = 0; //ULONG ItemCount = 0;
USHORT CurrentUsagePage; USHORT CurrentUsagePage;
PHID_REPORT_ITEM ReportItem; PHID_REPORT_ITEM ReportItem;
ULONG Data; ULONG Data;
@ -1017,7 +1017,7 @@ HidParser_DispatchKey(
// //
// is this a key break // is this a key break
// //
if (KeyAction == HidP_KeyboardBreak) if (KeyAction == HidP_Keyboard_Break)
{ {
// //
// add break // add break

6
lib/drivers/hidparser/hidparser.c
View file

@ -49,7 +49,7 @@ HidParser_GetCollectionDescription(
OUT PHIDP_DEVICE_DESC DeviceDescription) OUT PHIDP_DEVICE_DESC DeviceDescription)
{ {
HIDPARSER_STATUS ParserStatus; HIDPARSER_STATUS ParserStatus;
ULONG CollectionCount, ReportCount; ULONG CollectionCount;
ULONG Index; ULONG Index;
// //
@ -678,7 +678,9 @@ HidParser_TranslateUsageAndPagesToI8042ScanCodes(
// //
// process usage // 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) else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER)
{ {

2
lib/drivers/hidparser/hidparser.h
View file

@ -13,6 +13,7 @@
#define _HIDPI_ #define _HIDPI_
#define _HIDPI_NO_FUNCTION_MACROS_ #define _HIDPI_NO_FUNCTION_MACROS_
#include <ntddk.h> #include <ntddk.h>
#include <ntddkbd.h>
#include <hidpddi.h> #include <hidpddi.h>
#include <hidpi.h> #include <hidpi.h>
#include <debug.h> #include <debug.h>
@ -330,6 +331,7 @@ HIDAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
HidParser_TranslateUsageAndPagesToI8042ScanCodes( HidParser_TranslateUsageAndPagesToI8042ScanCodes(
IN PHID_PARSER Parser,
IN PUSAGE_AND_PAGE ChangedUsageList, IN PUSAGE_AND_PAGE ChangedUsageList,
IN ULONG UsageListLength, IN ULONG UsageListLength,
IN HIDP_KEYBOARD_DIRECTION KeyAction, IN HIDP_KEYBOARD_DIRECTION KeyAction,