Moved USB Host state machine code out from USBTask.c and into Host.c, where it more...

diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index 7b93172..928d95b 100644 (file)
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
@@ -44,9 +44,7 @@ TASK_LIST
        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
        #endif\r
        \r
        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
        #endif\r
        \r

-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r

        { .Task = USB_Keyboard_Report  , .TaskStatus = TASK_STOP },\r
        { .Task = USB_Keyboard_Report  , .TaskStatus = TASK_STOP },\r

-       #endif\r

 };\r
 \r
 /* Global Variables */\r
 };\r
 \r
 /* Global Variables */\r

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 36e16c9..45ad801 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -398,7 +398,7 @@
 \r
                /* Function Prototypes: */\r
                        #if defined(INCLUDE_FROM_EVENTS_C)\r
 \r
                /* Function Prototypes: */\r
                        #if defined(INCLUDE_FROM_EVENTS_C)\r

-                               void USB_Event_Stub (void) ATTR_CONST;\r
+                               void USB_Event_Stub(void) ATTR_CONST;\r

 \r
                                #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
                                        ALIAS_STUB(USB_VBUSChange);\r
 \r
                                #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
                                        ALIAS_STUB(USB_VBUSChange);\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 5202cc8..e2b7e91 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -81,178 +81,11 @@ static void USB_DeviceTask(void)
 #if defined(USB_CAN_BE_HOST)\r
 static void USB_HostTask(void)\r
 {\r
 #if defined(USB_CAN_BE_HOST)\r
 static void USB_HostTask(void)\r
 {\r

-       uint8_t ErrorCode    = HOST_ENUMERROR_NoError;\r
-       uint8_t SubErrorCode = HOST_ENUMERROR_NoError;\r
-       uint8_t PrevPipe     = Pipe_GetCurrentPipe();\r
+       uint8_t PrevPipe = Pipe_GetCurrentPipe();\r

        \r
        \r

-       static uint16_t WaitMSRemaining;\r
-       static uint8_t  PostWaitState;\r
-\r

        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r

-       switch (USB_HostState)\r
-       {\r
-               case HOST_STATE_WaitForDevice:\r
-                       if (WaitMSRemaining)\r
-                       {\r
-                               if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
-                               {\r
-                                       USB_HostState = PostWaitState;\r
-                                       ErrorCode     = HOST_ENUMERROR_WaitStage;\r
-                                       break;\r
-                               }\r
-                               \r
-                               WaitMSRemaining--;\r
-                       }\r
-                       else\r
-                       {\r
-                               USB_HostState = PostWaitState;\r
-                       }\r
-               \r
-                       break;\r
-               case HOST_STATE_Attached:\r
-                       WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;\r
-               \r
-                       USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
-                       break;\r
-               case HOST_STATE_Attached_WaitForDeviceSettle:\r
-                       _delay_ms(1);\r
-\r
-                       if (!(WaitMSRemaining--))\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
-                       }\r
-                       \r
-                       break;\r
-               case HOST_STATE_Attached_WaitForConnect:                \r
-                       if (USB_INT_HasOccurred(USB_INT_DCONNI))\r
-                       {       \r
-                               USB_INT_Clear(USB_INT_DCONNI);\r
-                               USB_INT_Clear(USB_INT_DDISCI);\r
-\r
-                               USB_INT_Clear(USB_INT_VBERRI);\r
-                               USB_INT_Enable(USB_INT_VBERRI);\r
-\r
-                               USB_IsConnected = true;\r
-                               RAISE_EVENT(USB_Connect);\r
-                                       \r
-                               USB_Host_ResumeBus();\r
-                               Pipe_ClearPipes();\r
-                               \r
-                               HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Attached_DoReset);\r
-                       }\r
-\r
-                       break;\r
-               case HOST_STATE_Attached_DoReset:\r
-                       USB_Host_ResetDevice();\r
-\r
-                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered);\r
-                       break;\r
-               case HOST_STATE_Powered:\r
-                       Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
-                                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
-                                                          PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r
-               \r
-                       if (!(Pipe_IsConfigured()))\r
-                       {\r
-                               ErrorCode    = HOST_ENUMERROR_PipeConfigError;\r
-                               SubErrorCode = 0;\r
-                               break;\r
-                       }\r
-\r
-                       USB_HostState = HOST_STATE_Default;\r
-                       break;\r
-               case HOST_STATE_Default:\r
-                       USB_ControlRequest = (USB_Request_Header_t)\r
-                               {\r
-                                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       .bRequest      = REQ_GetDescriptor,\r
-                                       .wValue        = (DTYPE_Device << 8),\r
-                                       .wIndex        = 0,\r
-                                       .wLength       = 8,\r
-                               };\r
-\r
-                       uint8_t DataBuffer[8];\r
-\r
-                       if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)\r
-                       {\r
-                               ErrorCode = HOST_ENUMERROR_ControlError;\r
-                               break;\r
-                       }\r
-\r
-                       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\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
-                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);\r
-                       break;\r
-               case HOST_STATE_Default_PostReset:\r
-                       Pipe_DisablePipe();\r
-                       Pipe_DeallocateMemory();                \r
-                       Pipe_ResetPipe(PIPE_CONTROLPIPE);\r
-                       \r
-                       Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
-                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
-                                          USB_ControlPipeSize, PIPE_BANK_SINGLE);\r
-\r
-                       if (!(Pipe_IsConfigured()))\r
-                       {\r
-                               ErrorCode    = HOST_ENUMERROR_PipeConfigError;\r
-                               SubErrorCode = 0;\r
-                               break;\r
-                       }\r
-\r
-                       Pipe_SetInfiniteINRequests();\r
-                       \r
-                       USB_ControlRequest = (USB_Request_Header_t)\r
-                               {\r
-                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       .bRequest      = REQ_SetAddress,\r
-                                       .wValue        = USB_HOST_DEVICEADDRESS,\r
-                                       .wIndex        = 0,\r
-                                       .wLength       = 0,\r
-                               };\r
-\r
-                       if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
-                       {\r
-                               ErrorCode = HOST_ENUMERROR_ControlError;\r
-                               break;\r
-                       }\r
-\r
-                       HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Default_PostAddressSet);\r
-                       break;\r
-               case HOST_STATE_Default_PostAddressSet:\r
-                       USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
-\r
-                       RAISE_EVENT(USB_DeviceEnumerationComplete);\r
-                       USB_HostState = HOST_STATE_Addressed;\r
-\r
-                       break;\r
-       }\r
-\r
-       if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
-       {\r
-               RAISE_EVENT(USB_DeviceEnumerationFailed, ErrorCode, SubErrorCode);\r
-\r
-               USB_Host_VBUS_Auto_Off();\r
-\r
-               RAISE_EVENT(USB_DeviceUnattached);\r
-               \r
-               if (USB_IsConnected)\r
-                 RAISE_EVENT(USB_Disconnect);\r
-\r
-               USB_ResetInterface();\r
-       }\r
+       USB_Host_ProcessNextHostState();\r

        \r
        Pipe_SelectPipe(PrevPipe);\r
 }\r
        \r
        Pipe_SelectPipe(PrevPipe);\r
 }\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index fe02f7c..9630b6a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -32,8 +32,179 @@
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r

+#define  INCLUDE_FROM_HOST_C\r

 #include "Host.h"\r
 \r
 #include "Host.h"\r
 \r

+void USB_Host_ProcessNextHostState(void)\r
+{\r
+       uint8_t ErrorCode    = HOST_ENUMERROR_NoError;\r
+       uint8_t SubErrorCode = HOST_ENUMERROR_NoError;\r
+\r
+       static uint16_t WaitMSRemaining;\r
+       static uint8_t  PostWaitState;\r
+\r
+       switch (USB_HostState)\r
+       {\r
+               case HOST_STATE_WaitForDevice:\r
+                       if (WaitMSRemaining)\r
+                       {\r
+                               if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
+                               {\r
+                                       USB_HostState = PostWaitState;\r
+                                       ErrorCode     = HOST_ENUMERROR_WaitStage;\r
+                                       break;\r
+                               }\r
+                               \r
+                               if (!(WaitMSRemaining--))\r
+                                 USB_HostState = PostWaitState;\r
+                       }\r
+               \r
+                       break;\r
+               case HOST_STATE_Attached:\r
+                       WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;\r
+               \r
+                       USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
+                       break;\r
+               case HOST_STATE_Attached_WaitForDeviceSettle:\r
+                       _delay_ms(1);\r
+\r
+                       if (!(WaitMSRemaining--))\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
+                       }\r
+                       \r
+                       break;\r
+               case HOST_STATE_Attached_WaitForConnect:                \r
+                       if (USB_INT_HasOccurred(USB_INT_DCONNI))\r
+                       {       \r
+                               USB_INT_Clear(USB_INT_DCONNI);\r
+                               USB_INT_Clear(USB_INT_DDISCI);\r
+\r
+                               USB_INT_Clear(USB_INT_VBERRI);\r
+                               USB_INT_Enable(USB_INT_VBERRI);\r
+\r
+                               USB_IsConnected = true;\r
+                               RAISE_EVENT(USB_Connect);\r
+                                       \r
+                               USB_Host_ResumeBus();\r
+                               Pipe_ClearPipes();\r
+                               \r
+                               HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Attached_DoReset);\r
+                       }\r
+\r
+                       break;\r
+               case HOST_STATE_Attached_DoReset:\r
+                       USB_Host_ResetDevice();\r
+\r
+                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered);\r
+                       break;\r
+               case HOST_STATE_Powered:\r
+                       Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
+                                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
+                                                          PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r
+               \r
+                       if (!(Pipe_IsConfigured()))\r
+                       {\r
+                               ErrorCode    = HOST_ENUMERROR_PipeConfigError;\r
+                               SubErrorCode = 0;\r
+                               break;\r
+                       }\r
+\r
+                       USB_HostState = HOST_STATE_Default;\r
+                       break;\r
+               case HOST_STATE_Default:\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r
+                               {\r
+                                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_GetDescriptor,\r
+                                       .wValue        = (DTYPE_Device << 8),\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 8,\r
+                               };\r
+\r
+                       uint8_t DataBuffer[8];\r
+\r
+                       if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)\r
+                       {\r
+                               ErrorCode = HOST_ENUMERROR_ControlError;\r
+                               break;\r
+                       }\r
+\r
+                       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\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
+                       HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);\r
+                       break;\r
+               case HOST_STATE_Default_PostReset:\r
+                       Pipe_DisablePipe();\r
+                       Pipe_DeallocateMemory();                \r
+                       Pipe_ResetPipe(PIPE_CONTROLPIPE);\r
+                       \r
+                       Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
+                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
+                                          USB_ControlPipeSize, PIPE_BANK_SINGLE);\r
+\r
+                       if (!(Pipe_IsConfigured()))\r
+                       {\r
+                               ErrorCode    = HOST_ENUMERROR_PipeConfigError;\r
+                               SubErrorCode = 0;\r
+                               break;\r
+                       }\r
+\r
+                       Pipe_SetInfiniteINRequests();\r
+                       \r
+                       USB_ControlRequest = (USB_Request_Header_t)\r
+                               {\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_SetAddress,\r
+                                       .wValue        = USB_HOST_DEVICEADDRESS,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r
+                               };\r
+\r
+                       if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+                       {\r
+                               ErrorCode = HOST_ENUMERROR_ControlError;\r
+                               break;\r
+                       }\r
+\r
+                       HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Default_PostAddressSet);\r
+                       break;\r
+               case HOST_STATE_Default_PostAddressSet:\r
+                       USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
+\r
+                       RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+                       USB_HostState = HOST_STATE_Addressed;\r
+\r
+                       break;\r
+       }\r
+\r
+       if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
+       {\r
+               RAISE_EVENT(USB_DeviceEnumerationFailed, ErrorCode, SubErrorCode);\r
+\r
+               USB_Host_VBUS_Auto_Off();\r
+\r
+               RAISE_EVENT(USB_DeviceUnattached);\r
+               \r
+               if (USB_IsConnected)\r
+                 RAISE_EVENT(USB_Disconnect);\r
+\r
+               USB_ResetInterface();\r
+       }\r
+}\r
+\r

 uint8_t USB_Host_WaitMS(uint8_t MS)\r
 {\r
        bool    BusSuspended = USB_Host_IsBusSuspended();\r
 uint8_t USB_Host_WaitMS(uint8_t MS)\r
 {\r
        bool    BusSuspended = USB_Host_IsBusSuspended();\r


@@ -80,7 +251,7 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
        return ErrorCode;\r
 }\r
 \r
        return ErrorCode;\r
 }\r
 \r

-void USB_Host_ResetDevice(void)\r
+static void USB_Host_ResetDevice(void)\r

 {\r
        bool BusSuspended = USB_Host_IsBusSuspended();\r
 \r
 {\r
        bool BusSuspended = USB_Host_IsBusSuspended();\r
 \r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h
index 9ce995f..4457c07 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.h
+++ b/LUFA/Drivers/USB/LowLevel/Host.h
@@ -265,8 +265,12 @@
                        };\r
 \r
                /* Function Prototypes: */\r
                        };\r
 \r
                /* Function Prototypes: */\r

+                       void    USB_Host_ProcessNextHostState(void);\r

                        uint8_t USB_Host_WaitMS(uint8_t MS);\r
                        uint8_t USB_Host_WaitMS(uint8_t MS);\r

-                       void    USB_Host_ResetDevice(void);\r
+                       \r
+                       #if defined(INCLUDE_FROM_HOST_C)\r
+                               static void USB_Host_ResetDevice(void);\r
+                       #endif\r

        #endif\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
        #endif\r
 \r
        /* Disable C linkage for C++ Compilers: */\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index a5adf99..fad1cbf 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -359,7 +359,7 @@
        \r
                /* Inline Functions: */\r
                        #if defined(USB_CAN_BE_BOTH)\r
        \r
                /* Inline Functions: */\r
                        #if defined(USB_CAN_BE_BOTH)\r

-                       static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r

                        static inline uint8_t USB_GetUSBModeFromUID(void)\r
                        {\r
                                if (USBSTA & (1 << ID))\r
                        static inline uint8_t USB_GetUSBModeFromUID(void)\r
                        {\r
                                if (USBSTA & (1 << ID))\r

diff --git a/LUFA/Drivers/USB/LowLevel/OTG.h b/LUFA/Drivers/USB/LowLevel/OTG.h
index 6d8185c..d3dee96 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/OTG.h
+++ b/LUFA/Drivers/USB/LowLevel/OTG.h
@@ -106,7 +106,6 @@
                                 */\r
                                static inline void USB_OTG_Dev_InitiateSRP(uint8_t SRPTypeMask);\r
                        #else\r
                                 */\r
                                static inline void USB_OTG_Dev_InitiateSRP(uint8_t SRPTypeMask);\r
                        #else\r

-\r

                                #define USB_OTG_Device_RequestHNP()         MACROS{ OTGCON |=  (1 << HNPREQ); }MACROE\r
 \r
                                #define USB_OTG_Device_CancelHNPRequest()   MACROS{ OTGCON &= ~(1 << HNPREQ); }MACROE\r
                                #define USB_OTG_Device_RequestHNP()         MACROS{ OTGCON |=  (1 << HNPREQ); }MACROE\r
 \r
                                #define USB_OTG_Device_CancelHNPRequest()   MACROS{ OTGCON &= ~(1 << HNPREQ); }MACROE\r

diff --git a/LUFA/LUFAPoweredProjects.txt b/LUFA/LUFAPoweredProjects.txt
index e1ba65d..b93604e 100644 (file)
--- a/LUFA/LUFAPoweredProjects.txt
+++ b/LUFA/LUFAPoweredProjects.txt
@@ -28,4 +28,5 @@
  *  - SEGA Megadrive/Genesis Development Cartridge: http://www.spritesmind.net/_GenDev/forum/viewtopic.php?t=464\r
  *  - CAMTRIG, a remote Camera Trigger device: http://code.astraw.com/projects/motmot/camtrig\r
  *  - Opendous-JTAG, an open source JTAG device: http://code.google.com/p/opendous-jtag/\r
  *  - SEGA Megadrive/Genesis Development Cartridge: http://www.spritesmind.net/_GenDev/forum/viewtopic.php?t=464\r
  *  - CAMTRIG, a remote Camera Trigger device: http://code.astraw.com/projects/motmot/camtrig\r
  *  - Opendous-JTAG, an open source JTAG device: http://code.google.com/p/opendous-jtag/\r

+ *  - Openkubus, an open source hardware-based authentication dongle: http://code.google.com/p/openkubus/\r

  */
\ No newline at end of file
  */
\ No newline at end of file