Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[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 e2b7e91..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
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \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
+  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


@@ -33,16 +33,18 @@
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\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
 USB_Request_Header_t USB_ControlRequest;\r
 \r
 volatile bool        USB_IsInitialized;\r
 USB_Request_Header_t USB_ControlRequest;\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


@@ -59,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
                if (Endpoint_IsSETUPReceived())\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
+                 USB_Device_ProcessControlRequest();\r

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