X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7..4f74075fad7f1e7a35d04ff534d9d6a57d2b97fc:/LUFA/Drivers/USB/HighLevel/USBTask.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 500a697bc..f1277b9a7 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -36,11 +36,11 @@
 volatile bool        USB_IsInitialized;
 USB_Request_Header_t USB_ControlRequest;
 
-#if defined(USB_CAN_BE_HOST)
+#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)
 volatile uint8_t     USB_HostState;
 #endif
 
-#if defined(USB_CAN_BE_DEVICE)
+#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)
 volatile uint8_t     USB_DeviceState;
 #endif
 
@@ -68,12 +68,7 @@ static void USB_DeviceTask(void)
 		Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
 
 		if (Endpoint_IsSETUPReceived())
-		{
-			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
-			{
-				USB_Device_ProcessControlPacket();
-			}
-		}
+		  USB_Device_ProcessControlRequest();
 		
 		Endpoint_SelectEndpoint(PrevEndpoint);
 	}