Add explicit guards to all device mode tasks to ensure the device is connected and...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Host.c

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 037e6d8..efe4bae 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -66,6 +66,7 @@ void USB_Host_ProcessNextHostState(void)
                        USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
                        break;\r
                case HOST_STATE_Attached_WaitForDeviceSettle:\r
                        USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
                        break;\r
                case HOST_STATE_Attached_WaitForDeviceSettle:\r

+                       #if HOST_DEVICE_SETTLE_DELAY_MS > 0\r

                        _delay_ms(1);\r
 \r
                        if (!(WaitMSRemaining--))\r
                        _delay_ms(1);\r
 \r
                        if (!(WaitMSRemaining--))\r


@@ -78,6 +79,9 @@ void USB_Host_ProcessNextHostState(void)
                                \r
                                USB_HostState = HOST_STATE_Attached_WaitForConnect;\r
                        }\r
                                \r
                                USB_HostState = HOST_STATE_Attached_WaitForConnect;\r
                        }\r

+                       #else\r
+                       USB_HostState = HOST_STATE_Attached_WaitForConnect;                     \r
+                       #endif\r

                        \r
                        break;\r
                case HOST_STATE_Attached_WaitForConnect:                \r
                        \r
                        break;\r
                case HOST_STATE_Attached_WaitForConnect:                \r


@@ -284,7 +288,7 @@ static void USB_Host_ResetDevice(void)
        USB_INT_Enable(USB_INT_DDISCI);\r
 }\r
 \r
        USB_INT_Enable(USB_INT_DDISCI);\r
 }\r
 \r

-uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber)\r
+uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)\r

 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r


@@ -300,7 +304,7 @@ uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber)
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r

-uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr)\r
+uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)\r

 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r