Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USB-BRINGUP]

Browse source 
- Fix build of hidparse

svn path=/branches/usb-bringup-trunk/; revision=55039
This commit is contained in:
Johannes Anderwald 2012-01-21 01:48:30 +00:00
parent 27023d1ff7
commit 82153d9360
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/hid/hidparse/hidparse.c
View file

@ -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);
}

3
drivers/hid/hidparse/hidparse.h
View file

@ -7,4 +7,5 @@
#include <hidpi.h>
#define NDEBUG
#include <debug.h>
#include "hidparser.h"
#include "hidparser.h"
#include <stdio.h>

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

@ -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

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

@ -49,7 +49,7 @@ HidParser_GetCollectionDescription(
OUT PHIDP_DEVICE_DESC DeviceDescription)
{
HIDPARSER_STATUS ParserStatus;
ULONG CollectionCount, ReportCount;
ULONG CollectionCount;
ULONG Index;
//

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

@ -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

1
lib/drivers/hidparser/parser.h
View file

@ -4,6 +4,7 @@
#include <assert.h>
#include <pshpack1.h>
#include "hidparser.h"
#include <ntddkbd.h>
/*
* Copyright 2007, Haiku, Inc. All Rights Reserved.