projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...
[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 9630b6a..6d425b2 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -55,20 +55,23 @@ void USB_Host_ProcessNextHostState(void)
                                        break;\r
                                }\r
                                \r
-                               if (!(WaitMSRemaining--))\r
+                               if (!(--WaitMSRemaining))\r
                                  USB_HostState = PostWaitState;\r
                        }\r
                \r
                        break;\r
-               case HOST_STATE_Attached:\r
+               case HOST_STATE_Powered:\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
-               case HOST_STATE_Attached_WaitForDeviceSettle:\r
-                       _delay_ms(1);\r
-\r
-                       if (!(WaitMSRemaining--))\r
+               case HOST_STATE_Powered_WaitForDeviceSettle:\r
+                       if (WaitMSRemaining--)\r
+                       {\r
+                               _delay_ms(1);\r
+                               break;\r
+                       }\r
+                       else\r
                        {\r
                                USB_Host_VBUS_Manual_Off();\r
 \r
@@ -76,11 +79,11 @@ void USB_Host_ProcessNextHostState(void)
                                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
                        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
@@ -88,23 +91,20 @@ void USB_Host_ProcessNextHostState(void)
 \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
+                               HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);\r
                        }\r
 \r
                        break;\r
-               case HOST_STATE_Attached_DoReset:\r
+               case HOST_STATE_Powered_DoReset:\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
-               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
@@ -136,11 +136,7 @@ void USB_Host_ProcessNextHostState(void)
                                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
@@ -162,8 +158,6 @@ void USB_Host_ProcessNextHostState(void)
                                break;\r
                        }\r
 \r
-                       Pipe_SetInfiniteINRequests();\r
-                       \r
                        USB_ControlRequest = (USB_Request_Header_t)\r
                                {\r
                                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
@@ -184,22 +178,18 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
-                       RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+                       EVENT_USB_Host_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
+               EVENT_USB_Host_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
+               EVENT_USB_Host_DeviceUnattached();\r
 \r
                USB_ResetInterface();\r
        }\r
@@ -210,7 +200,6 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
        bool    BusSuspended = USB_Host_IsBusSuspended();\r
        uint8_t ErrorCode    = HOST_WAITERROR_Successful;\r
        \r
-       USB_INT_Clear(USB_INT_HSOFI);\r
        USB_Host_ResumeBus();\r
 \r
        while (MS)\r
@@ -221,7 +210,7 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
                        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
@@ -260,9 +249,10 @@ static void USB_Host_ResetDevice(void)
        USB_Host_ResetBus();\r
        while (!(USB_Host_IsBusResetComplete()));\r
 \r
+       USB_Host_ResumeBus();\r
+\r
        USB_INT_Clear(USB_INT_HSOFI);\r
-       USB_Host_ResumeBus();   \r
-       \r
+\r
        for (uint8_t MSRem = 10; MSRem != 0; MSRem--)\r
        {\r
                /* Workaround for powerless-pull-up devices. After a USB bus reset,\r
@@ -272,6 +262,7 @@ static void USB_Host_ResetDevice(void)
 \r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
                {\r
+                       USB_INT_Clear(USB_INT_HSOFI);\r
                        USB_INT_Clear(USB_INT_DDISCI);\r
                        break;\r
                }\r
@@ -284,4 +275,72 @@ static void USB_Host_ResetDevice(void)
 \r
        USB_INT_Enable(USB_INT_DDISCI);\r
 }\r
+\r
+uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                       .bRequest      = REQ_SetConfiguration,\r
+                       .wValue        = ConfigNumber,\r
+                       .wIndex        = 0,\r
+                       .wLength       = 0,\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(NULL);\r
+}\r
+\r
+uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)\r
+{\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       = sizeof(USB_Descriptor_Device_t),\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(DeviceDescriptorPtr);\r
+}\r
+\r
+uint8_t USB_Host_GetDeviceStringDescriptor(uint8_t Index, void* const Buffer, uint8_t BufferLength)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                       .bRequest      = REQ_GetDescriptor,\r
+                       .wValue        = (DTYPE_String << 8) | Index,\r
+                       .wIndex        = 0,\r
+                       .wLength       = BufferLength,\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(Buffer);\r
+}\r
+\r
+uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)\r
+{\r
+       if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
+         EndpointNum |= ENDPOINT_DESCRIPTOR_DIR_IN;\r
+\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),\r
+                       .bRequest      = REQ_ClearFeature,\r
+                       .wValue        = FEATURE_ENDPOINT_HALT,\r
+                       .wIndex        = EndpointNum,\r
+                       .wLength       = 0,\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(NULL);\r
+}\r
+\r
 #endif\r
USB isp AVR programmer