Add a TELNET server to the webserver project, which currently can list active TCP...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / USBTask.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index c58e237..af3d7da 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -28,20 +28,23 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#include "../LowLevel/USBMode.h"\r
+#include "USBMode.h"\r

 \r
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r
 \r
 \r
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r
 \r

-volatile bool      USB_IsSuspended;\r
-volatile bool      USB_IsConnected;\r
-volatile bool      USB_IsInitialized;\r
+volatile bool        USB_IsInitialized;\r
+USB_Request_Header_t USB_ControlRequest;\r

 \r
 \r

-#if defined(USB_CAN_BE_HOST)\r
-volatile uint8_t   USB_HostState;\r
+#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)\r
+volatile uint8_t     USB_HostState;\r
+#endif\r
+\r
+#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)\r
+volatile uint8_t     USB_DeviceState;\r

 #endif\r
 \r
 #endif\r
 \r

-TASK(USB_USBTask)\r
+void USB_USBTask(void)\r

 {\r
        #if defined(USB_HOST_ONLY)\r
                USB_HostTask();\r
 {\r
        #if defined(USB_HOST_ONLY)\r
                USB_HostTask();\r


@@ -58,19 +61,14 @@ TASK(USB_USBTask)
 #if defined(USB_CAN_BE_DEVICE)\r
 static void USB_DeviceTask(void)\r
 {\r
 #if defined(USB_CAN_BE_DEVICE)\r
 static void USB_DeviceTask(void)\r
 {\r

-       if (USB_IsConnected)\r
+       if (USB_DeviceState != DEVICE_STATE_Unattached)\r

        {\r
                uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();\r
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        {\r
                uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();\r
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r

-               if (Endpoint_IsSetupReceived())\r
-               {\r
-                       ATOMIC_BLOCK(ATOMIC_RESTORESTATE)\r
-                       {\r
-                               USB_Device_ProcessControlPacket();\r
-                       }\r
-               }\r
+               if (Endpoint_IsSETUPReceived())\r
+                 USB_Device_ProcessControlRequest();\r

                \r
                Endpoint_SelectEndpoint(PrevEndpoint);\r
        }\r
                \r
                Endpoint_SelectEndpoint(PrevEndpoint);\r
        }\r


@@ -80,174 +78,12 @@ 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

        \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
-                               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, PIPE_CONTROLPIPE,\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_HostRequest = (USB_Host_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:       PIPE_CONTROLPIPE_DEFAULT_SIZE,\r
-                               };\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r

 \r
 \r

-                       uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];\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
+       USB_Host_ProcessNextHostState();\r

        \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, PIPE_CONTROLPIPE,\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_HostRequest = (USB_Host_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
+       Pipe_SelectPipe(PrevPipe);\r

 }\r
 #endif\r
 }\r
 #endif\r