X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1132488e8f80b43473ce4e53db9dd8ce12e87e13..9740d3a55f1e5dc297aeddbb3c822831a426c658:/LUFA/Drivers/USB/Core/USBTask.c

diff --git a/LUFA/Drivers/USB/Core/USBTask.c b/LUFA/Drivers/USB/Core/USBTask.c
index b0b6914af..70b563d3d 100644
--- a/LUFA/Drivers/USB/Core/USBTask.c
+++ b/LUFA/Drivers/USB/Core/USBTask.c
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -45,34 +45,32 @@ volatile uint8_t     USB_DeviceState;
 
 void USB_USBTask(void)
 {
-	#if defined(USB_HOST_ONLY)
-		USB_HostTask();
-	#elif defined(USB_DEVICE_ONLY)
-		USB_DeviceTask();
-	#else
+	#if defined(USB_CAN_BE_BOTH)
 		if (USB_CurrentMode == USB_MODE_Device)
 		  USB_DeviceTask();
-		#if defined(USB_CAN_BE_HOST)
 		else if (USB_CurrentMode == USB_MODE_Host)
 		  USB_HostTask();
-		#endif
+	#elif defined(USB_CAN_BE_HOST)
+		USB_HostTask();
+	#elif defined(USB_CAN_BE_DEVICE)
+		USB_DeviceTask();
 	#endif
 }
 
 #if defined(USB_CAN_BE_DEVICE)
 static void USB_DeviceTask(void)
 {
-	if (USB_DeviceState != DEVICE_STATE_Unattached)
-	{
-		uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();
+	if (USB_DeviceState == DEVICE_STATE_Unattached)
+	  return;
+
+	uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();
 
-		Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
+	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
 
-		if (Endpoint_IsSETUPReceived())
-		  USB_Device_ProcessControlRequest();
+	if (Endpoint_IsSETUPReceived())
+	  USB_Device_ProcessControlRequest();
 
-		Endpoint_SelectEndpoint(PrevEndpoint);
-	}
+	Endpoint_SelectEndpoint(PrevEndpoint);
 }
 #endif