Moved USB Host state machine code out from USBTask.c and into Host.c, where it more...
[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Host.c
index fe02f7c..9630b6a 100644 (file)
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
+#define  INCLUDE_FROM_HOST_C\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
@@ -80,7 +251,7 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
        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