X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c1be3073939c71d17c92fcbce4e1690d0a1443f0..03ee87b35abdb8b92e8b55ec040fa943f9a6786c:/LUFA/Drivers/USB/HighLevel/USBTask.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 31cedacb8..af3d7da90 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -36,11 +36,11 @@
 volatile bool        USB_IsInitialized;
 USB_Request_Header_t USB_ControlRequest;
 
-#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR1)
+#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)
 volatile uint8_t     USB_HostState;
 #endif
 
-#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR0)
+#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);
 	}