Rename V2ProtocolTarget files to ISPTarget in the AVRISP Programmer Clone project.

[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 8a51ae5..1e22ffc 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -67,10 +67,14 @@ void USB_Host_ProcessNextHostState(void)
                        break;\r
                case HOST_STATE_Powered_WaitForDeviceSettle:\r
                        #if HOST_DEVICE_SETTLE_DELAY_MS > 0\r
                        break;\r
                case HOST_STATE_Powered_WaitForDeviceSettle:\r
                        #if HOST_DEVICE_SETTLE_DELAY_MS > 0\r

-                       _delay_ms(1);\r
-\r

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

+                               _delay_ms(1);\r
+                               break;\r
+                       }\r
+                       else\r
+                       #endif\r
+                       {\r

                                USB_Host_VBUS_Manual_Off();\r
 \r
                                USB_OTGPAD_On();\r
                                USB_Host_VBUS_Manual_Off();\r
 \r
                                USB_OTGPAD_On();\r


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

-                       #else\r
-                       USB_HostState = HOST_STATE_Powered_WaitForConnect;                      \r
-                       #endif\r

                        \r
                        break;\r
                case HOST_STATE_Powered_WaitForConnect:         \r
                        \r
                        break;\r
                case HOST_STATE_Powered_WaitForConnect:         \r


@@ -137,11 +138,7 @@ void USB_Host_ProcessNextHostState(void)
                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r

-                       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r

                        USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];\r
                        USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];\r

-                       #else\r
-                       USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, bMaxPacketSize0)];                   \r
-                       #endif\r

        \r
                        USB_Host_ResetDevice();\r
                        \r
        \r
                        USB_Host_ResetDevice();\r
                        \r


@@ -316,7 +313,7 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
 uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)\r
 {\r
        if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
 uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)\r
 {\r
        if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r

-         EndpointNum |= (1 << 7);\r
+         EndpointNum |= ENDPOINT_DESCRIPTOR_DIR_IN;\r

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