Speed up bit-banged USART code in the AVRISP project.

[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 31cedac..f1277b9 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -36,11 +36,11 @@
 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) && !defined(HOST_STATE_AS_GPIOR1)\r
+#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)\r

 volatile uint8_t     USB_HostState;\r
 #endif\r
 \r
 volatile uint8_t     USB_HostState;\r
 #endif\r
 \r

-#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR0)\r
+#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)\r

 volatile uint8_t     USB_DeviceState;\r
 #endif\r
 \r
 volatile uint8_t     USB_DeviceState;\r
 #endif\r
 \r


@@ -68,12 +68,7 @@ static void USB_DeviceTask(void)
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
                if (Endpoint_IsSETUPReceived())\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