From b9f3ff39a41c5dea00a651b7efe75f0f15a71ed1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sat, 1 Sep 2012 22:55:56 +0000 Subject: [PATCH] Use an early-abort in the USB_DeviceTask() function rather than wrapping the entire implementation in a conditional. --- LUFA/Drivers/USB/Core/USBTask.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/LUFA/Drivers/USB/Core/USBTask.c b/LUFA/Drivers/USB/Core/USBTask.c index 71ae47d022..be14611aa1 100644 --- a/LUFA/Drivers/USB/Core/USBTask.c +++ b/LUFA/Drivers/USB/Core/USBTask.c @@ -60,17 +60,17 @@ void USB_USBTask(void) #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; - Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); + uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint(); - if (Endpoint_IsSETUPReceived()) - USB_Device_ProcessControlRequest(); + Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); - Endpoint_SelectEndpoint(PrevEndpoint); - } + if (Endpoint_IsSETUPReceived()) + USB_Device_ProcessControlRequest(); + + Endpoint_SelectEndpoint(PrevEndpoint); } #endif