aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/Class/Host
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-12-04 02:06:38 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-12-04 02:06:38 +0000
commit7e86387958555c489ec8a397b463c437be24e1fd (patch)
tree1f329ab5156ce16e4aa19aed19713ee475b6b586 /LUFA/Drivers/USB/Class/Host
parenta925407588726cf6c0587e932b56b3b6257529e0 (diff)
downloadlufa-7e86387958555c489ec8a397b463c437be24e1fd.tar.gz
lufa-7e86387958555c489ec8a397b463c437be24e1fd.tar.bz2
lufa-7e86387958555c489ec8a397b463c437be24e1fd.zip
Fix double oops -- Host mode settle delay was still being ignored due to inverted logic, HID Parser was assigning the usage Min/Max usage value to the report item's collection path rather than the report item itself.
Diffstat (limited to 'LUFA/Drivers/USB/Class/Host')
-rw-r--r--LUFA/Drivers/USB/Class/Host/HIDParser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
index 3c39e9685..5b295edc4 100644
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -194,7 +194,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
for (uint8_t i = 0; i < UsageListSize; i++)
UsageList[i] = UsageList[i + 1];
-
+
UsageListSize--;
}
else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
@@ -235,9 +235,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
}
else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
{
- CurrCollectionPath->Usage.Usage = UsageMinMax.Minimum++;
+ NewReportItem.Attributes.Usage.Usage = UsageMinMax.Minimum++;
}
-
+
uint8_t ItemTag = (HIDReportItem & TAG_MASK);
if (ItemTag == TAG_MAIN_INPUT)