projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update architecture specific makefile templates so that they are as close to one...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Class
/
Common
/
HIDParser.c
diff --git
a/LUFA/Drivers/USB/Class/Common/HIDParser.c
b/LUFA/Drivers/USB/Class/Common/HIDParser.c
index
7b13f1a
..
20fceab
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ b/
LUFA/Drivers/USB/Class/Common/HIDParser.c
@@
-61,12
+61,12
@@
uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
switch (HIDReportItem & HID_RI_DATA_SIZE_MASK)
{
case HID_RI_DATA_BITS_32:
switch (HIDReportItem & HID_RI_DATA_SIZE_MASK)
{
case HID_RI_DATA_BITS_32:
- ReportItemData =
*((uint32_t*)ReportData
);
+ ReportItemData =
le32_to_cpu(*((uint32_t*)ReportData)
);
ReportSize -= 4;
ReportData += 4;
break;
case HID_RI_DATA_BITS_16:
ReportSize -= 4;
ReportData += 4;
break;
case HID_RI_DATA_BITS_16:
- ReportItemData =
*((uint16_t*)ReportData
);
+ ReportItemData =
le16_to_cpu(*((uint16_t*)ReportData)
);
ReportSize -= 2;
ReportData += 2;
break;
ReportSize -= 2;
ReportData += 2;
break;
@@
-96,6
+96,9
@@
uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
CurrStateTable--;
break;
case HID_RI_USAGE_PAGE(0):
CurrStateTable--;
break;
case HID_RI_USAGE_PAGE(0):
+ if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32)
+ CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16);
+
CurrStateTable->Attributes.Usage.Page = ReportItemData;
break;
case HID_RI_LOGICAL_MINIMUM(0):
CurrStateTable->Attributes.Usage.Page = ReportItemData;
break;
case HID_RI_LOGICAL_MINIMUM(0):