Make the StandaloneProgrammer project seamlessly read out drive contents from either...

[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 78a9ca8..1e22ffc 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -60,31 +60,32 @@ void USB_Host_ProcessNextHostState(void)
                        }\r
                \r
                        break;\r
                        }\r
                \r
                        break;\r

-               case HOST_STATE_Attached:\r
+               case HOST_STATE_Powered:\r

                        WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;\r
                \r
                        WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;\r
                \r

-                       USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
+                       USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;\r

                        break;\r
                        break;\r

-               case HOST_STATE_Attached_WaitForDeviceSettle:\r
+               case HOST_STATE_Powered_WaitForDeviceSettle:\r

                        #if HOST_DEVICE_SETTLE_DELAY_MS > 0\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_Auto_Enable();\r
                                USB_Host_VBUS_Auto_On();\r
                                \r
                                USB_Host_VBUS_Manual_Off();\r
 \r
                                USB_OTGPAD_On();\r
                                USB_Host_VBUS_Auto_Enable();\r
                                USB_Host_VBUS_Auto_On();\r
                                \r

-                               USB_HostState = HOST_STATE_Attached_WaitForConnect;\r
+                               USB_HostState = HOST_STATE_Powered_WaitForConnect;\r

                        }\r
                        }\r

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

                        \r
                        break;\r
                        \r
                        break;\r

-               case HOST_STATE_Attached_WaitForConnect:                \r
+               case HOST_STATE_Powered_WaitForConnect:         \r

                        if (USB_INT_HasOccurred(USB_INT_DCONNI))\r
                        {       \r
                                USB_INT_Clear(USB_INT_DCONNI);\r
                        if (USB_INT_HasOccurred(USB_INT_DCONNI))\r
                        {       \r
                                USB_INT_Clear(USB_INT_DCONNI);\r


@@ -92,23 +93,20 @@ void USB_Host_ProcessNextHostState(void)
 \r
                                USB_INT_Clear(USB_INT_VBERRI);\r
                                USB_INT_Enable(USB_INT_VBERRI);\r
 \r
                                USB_INT_Clear(USB_INT_VBERRI);\r
                                USB_INT_Enable(USB_INT_VBERRI);\r

-\r
-                               USB_IsConnected = true;\r
-                               EVENT_USB_Connect();\r

                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r
                                \r
                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r
                                \r

-                               HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Attached_DoReset);\r
+                               HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r

-               case HOST_STATE_Attached_DoReset:\r
+               case HOST_STATE_Powered_DoReset:\r

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

-                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered);\r
+                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);\r

                        break;\r
                        break;\r

-               case HOST_STATE_Powered:\r
+               case HOST_STATE_Powered_ConfigPipe:\r

                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
                                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
                                                           PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
                                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
                                                           PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r


@@ -140,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


@@ -186,22 +180,18 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r

-                       EVENT_USB_DeviceEnumerationComplete();\r
+                       EVENT_USB_Host_DeviceEnumerationComplete();\r

                        USB_HostState = HOST_STATE_Addressed;\r
                        USB_HostState = HOST_STATE_Addressed;\r

-\r

                        break;\r
        }\r
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r
                        break;\r
        }\r
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r

-               EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
+               EVENT_USB_Host_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r

 \r
                USB_Host_VBUS_Auto_Off();\r
 \r
 \r
                USB_Host_VBUS_Auto_Off();\r
 \r

-               EVENT_USB_DeviceUnattached();\r
-               \r
-               if (USB_IsConnected)\r
-                 EVENT_USB_Disconnect();\r
+               EVENT_USB_Host_DeviceUnattached();\r

 \r
                USB_ResetInterface();\r
        }\r
 \r
                USB_ResetInterface();\r
        }\r


@@ -222,7 +212,7 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
                        MS--;\r
                }\r
                                        \r
                        MS--;\r
                }\r
                                        \r

-               if ((USB_IsConnected == false) || (USB_CurrentMode == USB_MODE_DEVICE))\r
+               if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode == USB_MODE_DEVICE))\r

                {\r
                        ErrorCode = HOST_WAITERROR_DeviceDisconnect;\r
                        \r
                {\r
                        ErrorCode = HOST_WAITERROR_DeviceDisconnect;\r
                        \r


@@ -288,7 +278,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


@@ -304,7 +294,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


@@ -323,7 +313,7 @@ uint8_t USB_Host_GetDeviceDescriptor(void* 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