Added new USB_DeviceState variable to keep track of the current Device mode USB state.

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

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index efe4bae..ae7525b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -60,12 +60,12 @@ 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
                        _delay_ms(1);\r
 \r
                        #if HOST_DEVICE_SETTLE_DELAY_MS > 0\r
                        _delay_ms(1);\r
 \r


@@ -77,14 +77,14 @@ void USB_Host_ProcessNextHostState(void)
                                USB_Host_VBUS_Auto_Enable();\r
                                USB_Host_VBUS_Auto_On();\r
                                \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
                        #else\r
                        }\r
                        #else\r

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

                        #endif\r
                        \r
                        break;\r
                        #endif\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


@@ -93,22 +93,21 @@ void USB_Host_ProcessNextHostState(void)
                                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
                                EVENT_USB_Connect();\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


@@ -199,9 +198,7 @@ void USB_Host_ProcessNextHostState(void)
                USB_Host_VBUS_Auto_Off();\r
 \r
                EVENT_USB_DeviceUnattached();\r
                USB_Host_VBUS_Auto_Off();\r
 \r
                EVENT_USB_DeviceUnattached();\r

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

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


@@ -222,7 +219,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