Fix double oops -- Host mode settle delay was still being ignored due to inverted...

diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
index 3c39e96..5b295ed 100644 (file)
--- 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
 \r
                                        for (uint8_t i = 0; i < UsageListSize; i++)\r
                                          UsageList[i] = UsageList[i + 1];\r
 \r
                                        for (uint8_t i = 0; i < UsageListSize; i++)\r
                                          UsageList[i] = UsageList[i + 1];\r

-                                         \r
+                                       \r

                                        UsageListSize--;\r
                                }\r
                                else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r
                                        UsageListSize--;\r
                                }\r
                                else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r


@@ -235,9 +235,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                        }\r
                                        else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r
                                        {\r
                                        }\r
                                        else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r
                                        {\r

-                                               CurrCollectionPath->Usage.Usage = UsageMinMax.Minimum++;\r
+                                               NewReportItem.Attributes.Usage.Usage = UsageMinMax.Minimum++;\r

                                        }\r
                                        }\r

-                               \r
+                                       \r

                                        uint8_t ItemTag = (HIDReportItem & TAG_MASK);\r
 \r
                                        if (ItemTag == TAG_MAIN_INPUT)\r
                                        uint8_t ItemTag = (HIDReportItem & TAG_MASK);\r
 \r
                                        if (ItemTag == TAG_MAIN_INPUT)\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index b83c514..98185a4 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -66,7 +66,7 @@ void USB_Host_ProcessNextHostState(void)
                        USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;\r
                        break;\r
                case HOST_STATE_Powered_WaitForDeviceSettle:\r
                        USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;\r
                        break;\r
                case HOST_STATE_Powered_WaitForDeviceSettle:\r

-                       if (!(WaitMSRemaining--))\r
+                       if (WaitMSRemaining--)\r

                        {\r
                                _delay_ms(1);\r
                                break;\r
                        {\r
                                _delay_ms(1);\r
                                break;\r