Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 12:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HIDPARSER, HIDPARSE, INCLUDE]

Browse source 
- Fix function signatures
CORE-7183 #comment fixed #resolve

svn path=/trunk/; revision=59217
This commit is contained in:
Johannes Anderwald 2013-06-15 06:18:02 +00:00
parent d51f1d5cd8
commit 042a365171
7 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/drivers/hid/hidparse/hidparse.c
View file

@ -73,11 +73,10 @@ DebugFunction(
{ {
va_list args; va_list args;
unsigned int i;
char printbuffer[1024]; char printbuffer[1024];
va_start(args, FormatStr); va_start(args, FormatStr);
i = vsprintf(printbuffer, FormatStr, args); vsprintf(printbuffer, FormatStr, args);
va_end(args); va_end(args);
DbgPrint(printbuffer); DbgPrint(printbuffer);
@ -179,7 +178,7 @@ HidP_GetSpecificValueCaps(
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength, IN OUT PUSHORT ValueCapsLength,
IN PHIDP_PREPARSED_DATA PreparsedData) IN PHIDP_PREPARSED_DATA PreparsedData)
{ {
HID_PARSER Parser; HID_PARSER Parser;
@ -204,14 +203,14 @@ HIDAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
HidP_GetUsages( HidP_GetUsages(
IN HIDP_REPORT_TYPE ReportType, IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage, IN USAGE UsagePage,
IN USHORT LinkCollection OPTIONAL, IN USHORT LinkCollection OPTIONAL,
OUT USAGE *UsageList, OUT PUSAGE UsageList,
IN OUT ULONG *UsageLength, IN OUT PULONG UsageLength,
IN PHIDP_PREPARSED_DATA PreparsedData, IN PHIDP_PREPARSED_DATA PreparsedData,
IN PCHAR Report, IN PCHAR Report,
IN ULONG ReportLength) IN ULONG ReportLength)
{ {
HID_PARSER Parser; HID_PARSER Parser;
@ -371,19 +370,19 @@ HidP_GetButtonCaps(
PUSHORT ButtonCapsLength, PUSHORT ButtonCapsLength,
PHIDP_PREPARSED_DATA PreparsedData) PHIDP_PREPARSED_DATA PreparsedData)
{ {
return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, ButtonCapsLength, PreparsedData);
} }
HIDAPI HIDAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
HidP_GetSpecificButtonCaps( HidP_GetSpecificButtonCaps(
IN HIDP_REPORT_TYPE ReportType, IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage, IN USAGE UsagePage,
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_BUTTON_CAPS ButtonCaps, OUT PHIDP_BUTTON_CAPS ButtonCaps,
IN OUT PULONG ButtonCapsLength, IN OUT PUSHORT ButtonCapsLength,
IN PHIDP_PREPARSED_DATA PreparsedData) IN PHIDP_PREPARSED_DATA PreparsedData)
{ {
UNIMPLEMENTED UNIMPLEMENTED
@ -412,7 +411,7 @@ NTSTATUS
NTAPI NTAPI
HidP_GetExtendedAttributes( HidP_GetExtendedAttributes(
IN HIDP_REPORT_TYPE ReportType, IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage, IN USHORT DataIndex,
IN PHIDP_PREPARSED_DATA PreparsedData, IN PHIDP_PREPARSED_DATA PreparsedData,
OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, OUT PHIDP_EXTENDED_ATTRIBUTES Attributes,
IN OUT PULONG LengthAttributes) IN OUT PULONG LengthAttributes)
@ -637,7 +636,7 @@ NTAPI
HidP_GetValueCaps( HidP_GetValueCaps(
HIDP_REPORT_TYPE ReportType, HIDP_REPORT_TYPE ReportType,
PHIDP_VALUE_CAPS ValueCaps, PHIDP_VALUE_CAPS ValueCaps,
PULONG ValueCapsLength, PUSHORT ValueCapsLength,
PHIDP_PREPARSED_DATA PreparsedData) PHIDP_PREPARSED_DATA PreparsedData)
{ {
UNIMPLEMENTED UNIMPLEMENTED

2
reactos/drivers/hid/hidparse/hidparse.h
View file

@ -6,7 +6,7 @@
#include <hidpddi.h> #include <hidpddi.h>
#include <hidpi.h> #include <hidpi.h>
#define NDEBUG #define NDEBUG
#include <debug.h> //#include <debug.h>
#include "hidparser.h" #include "hidparser.h"
#include <stdio.h> #include <stdio.h>

4
reactos/include/psdk/hidpi.h
View file

@ -369,7 +369,7 @@ HidP_GetSpecificButtonCaps(
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_BUTTON_CAPS ButtonCaps, OUT PHIDP_BUTTON_CAPS ButtonCaps,
IN OUT PULONG ButtonCapsLength, IN OUT PUSHORT ButtonCapsLength,
IN PHIDP_PREPARSED_DATA PreparsedData); IN PHIDP_PREPARSED_DATA PreparsedData);
HIDAPI HIDAPI
@ -381,7 +381,7 @@ HidP_GetSpecificValueCaps(
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength, IN OUT PUSHORT ValueCapsLength,
IN PHIDP_PREPARSED_DATA PreparsedData); IN PHIDP_PREPARSED_DATA PreparsedData);
HIDAPI HIDAPI

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

@ -273,11 +273,11 @@ HidParser_GetSpecificValueCapsWithReport(
IN USHORT UsagePage, IN USHORT UsagePage,
IN USHORT Usage, IN USHORT Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength) IN OUT PUSHORT ValueCapsLength)
{ {
ULONG Index; ULONG Index;
PHID_REPORT Report; PHID_REPORT Report;
ULONG ItemCount = 0; USHORT ItemCount = 0;
USHORT CurrentUsagePage; USHORT CurrentUsagePage;
USHORT CurrentUsage; USHORT CurrentUsage;

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

@ -350,7 +350,7 @@ HidParser_GetSpecificValueCaps(
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength) IN OUT PUSHORT ValueCapsLength)
{ {
HIDPARSER_STATUS ParserStatus; HIDPARSER_STATUS ParserStatus;

12
reactos/lib/drivers/hidparser/hidparser.h
View file

@ -123,12 +123,12 @@ NTAPI
HidParser_GetSpecificValueCaps( HidParser_GetSpecificValueCaps(
IN PHID_PARSER Parser, IN PHID_PARSER Parser,
IN PVOID CollectionContext, IN PVOID CollectionContext,
IN HIDP_REPORT_TYPE ReportType, IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage, IN USAGE UsagePage,
IN USHORT LinkCollection, IN USHORT LinkCollection,
IN USAGE Usage, IN USAGE Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength); IN OUT PUSHORT ValueCapsLength);
HIDAPI HIDAPI

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

@ -302,7 +302,7 @@ HidParser_GetSpecificValueCapsWithReport(
IN USHORT UsagePage, IN USHORT UsagePage,
IN USHORT Usage, IN USHORT Usage,
OUT PHIDP_VALUE_CAPS ValueCaps, OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength); IN OUT PUSHORT ValueCapsLength);
HIDPARSER_STATUS HIDPARSER_STATUS