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

[HIDPARSER] Remove HIDPARSER specific error codes, and remplace them by HIDP_* NTSTATUS codes

Browse source 
Remove now useless TranslateHidParserStatus() function.
This commit is contained in:
Hervé Poussineau 2020-04-17 23:54:14 +02:00
parent c151f8a1c7
commit c4055c455f
7 changed files with 117 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

58
sdk/lib/drivers/hidparser/api.c
View file

@ -61,7 +61,7 @@ static struct
#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8))
HIDPARSER_STATUS
NTSTATUS
HidParser_GetCollectionUsagePage(
IN PVOID CollectionContext,
OUT PUSHORT Usage,
@ -78,7 +78,7 @@ HidParser_GetCollectionUsagePage(
//
// collection not found
//
return HIDPARSER_STATUS_COLLECTION_NOT_FOUND;
return HIDP_STATUS_USAGE_NOT_FOUND;
}
//
@ -86,7 +86,7 @@ HidParser_GetCollectionUsagePage(
//
*UsagePage = (Collection->Usage >> 16);
*Usage = (Collection->Usage & 0xFFFF);
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
ULONG
@ -250,7 +250,7 @@ HidParser_GetMaxUsageListLengthWithReportAndPage(
return ItemCount;
}
HIDPARSER_STATUS
NTSTATUS
HidParser_GetSpecificValueCapsWithReport(
IN PVOID CollectionContext,
IN UCHAR ReportType,
@ -274,7 +274,7 @@ HidParser_GetSpecificValueCapsWithReport(
//
// no such report
//
return HIDPARSER_STATUS_REPORT_NOT_FOUND;
return HIDP_STATUS_REPORT_DOES_NOT_EXIST;
}
for(Index = 0; Index < Report->ItemCount; Index++)
@ -330,16 +330,16 @@ HidParser_GetSpecificValueCapsWithReport(
//
// success
//
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
//
// item not found
//
return HIDPARSER_STATUS_USAGE_NOT_FOUND;
return HIDP_STATUS_USAGE_NOT_FOUND;
}
HIDPARSER_STATUS
NTSTATUS
HidParser_GetUsagesWithReport(
IN PVOID CollectionContext,
IN UCHAR ReportType,
@ -367,7 +367,7 @@ HidParser_GetUsagesWithReport(
//
// no such report
//
return HIDPARSER_STATUS_REPORT_NOT_FOUND;
return HIDP_STATUS_REPORT_DOES_NOT_EXIST;
}
if (Report->ReportSize / 8 != (ReportDescriptorLength - 1))
@ -375,7 +375,7 @@ HidParser_GetUsagesWithReport(
//
// invalid report descriptor length
//
return HIDPARSER_STATUS_INVALID_REPORT_LENGTH;
return HIDP_STATUS_INVALID_REPORT_LENGTH;
}
//
@ -490,7 +490,7 @@ HidParser_GetUsagesWithReport(
//
// list too small
//
return HIDPARSER_STATUS_BUFFER_TOO_SMALL;
return HIDP_STATUS_BUFFER_TOO_SMALL;
}
if (UsagePage == HID_USAGE_PAGE_UNDEFINED)
@ -517,7 +517,7 @@ HidParser_GetUsagesWithReport(
//
// done
//
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
ULONG
@ -546,7 +546,7 @@ HidParser_UsesReportId(
}
HIDPARSER_STATUS
NTSTATUS
HidParser_GetUsageValueWithReport(
IN PVOID CollectionContext,
IN UCHAR ReportType,
@ -571,7 +571,7 @@ HidParser_GetUsageValueWithReport(
//
// no such report
//
return HIDPARSER_STATUS_REPORT_NOT_FOUND;
return HIDP_STATUS_REPORT_DOES_NOT_EXIST;
}
if (Report->ReportSize / 8 != (ReportDescriptorLength - 1))
@ -579,7 +579,7 @@ HidParser_GetUsageValueWithReport(
//
// invalid report descriptor length
//
return HIDPARSER_STATUS_INVALID_REPORT_LENGTH;
return HIDP_STATUS_INVALID_REPORT_LENGTH;
}
for (Index = 0; Index < Report->ItemCount; Index++)
@ -631,18 +631,18 @@ HidParser_GetUsageValueWithReport(
// store result
//
*UsageValue = Data;
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
//
// usage not found
//
return HIDPARSER_STATUS_USAGE_NOT_FOUND;
return HIDP_STATUS_USAGE_NOT_FOUND;
}
HIDPARSER_STATUS
NTSTATUS
HidParser_GetScaledUsageValueWithReport(
IN PVOID CollectionContext,
IN UCHAR ReportType,
@ -667,7 +667,7 @@ HidParser_GetScaledUsageValueWithReport(
//
// no such report
//
return HIDPARSER_STATUS_REPORT_NOT_FOUND;
return HIDP_STATUS_REPORT_DOES_NOT_EXIST;
}
if (Report->ReportSize / 8 != (ReportDescriptorLength - 1))
@ -675,7 +675,7 @@ HidParser_GetScaledUsageValueWithReport(
//
// invalid report descriptor length
//
return HIDPARSER_STATUS_INVALID_REPORT_LENGTH;
return HIDP_STATUS_INVALID_REPORT_LENGTH;
}
for (Index = 0; Index < Report->ItemCount; Index++)
@ -738,20 +738,20 @@ HidParser_GetScaledUsageValueWithReport(
else
{
// logical boundaries are absolute values
return HIDPARSER_STATUS_BAD_LOG_PHY_VALUES;
return HIDP_STATUS_BAD_LOG_PHY_VALUES;
}
//
// store result
//
*UsageValue = Data;
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
//
// usage not found
//
return HIDPARSER_STATUS_USAGE_NOT_FOUND;
return HIDP_STATUS_USAGE_NOT_FOUND;
}
ULONG
@ -847,7 +847,7 @@ HidParser_DispatchKey(
}
}
HIDPARSER_STATUS
NTSTATUS
HidParser_TranslateKbdUsage(
IN USAGE Usage,
IN HIDP_KEYBOARD_DIRECTION KeyAction,
@ -869,7 +869,7 @@ HidParser_TranslateKbdUsage(
// invalid lookup or no scan code available
//
DPRINT1("No Scan code for Usage %x\n", Usage);
return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN;
return HIDP_STATUS_I8042_TRANS_UNKNOWN;
}
if (ScanCode & 0xFF00)
@ -906,10 +906,10 @@ HidParser_TranslateKbdUsage(
//
// done
//
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}
HIDPARSER_STATUS
NTSTATUS
HidParser_TranslateCustUsage(
IN USAGE Usage,
IN HIDP_KEYBOARD_DIRECTION KeyAction,
@ -929,7 +929,7 @@ HidParser_TranslateCustUsage(
// invalid lookup or no scan code available
//
DPRINT1("No Scan code for Usage %x\n", Usage);
return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN;
return HIDP_STATUS_I8042_TRANS_UNKNOWN;
}
if (ScanCode & 0xFF00)
@ -948,5 +948,5 @@ HidParser_TranslateCustUsage(
//
// done
//
return HIDPARSER_STATUS_SUCCESS;
return HIDP_STATUS_SUCCESS;
}