projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for the Atmel UC3-A3 Xplained board.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Core
/
USBTask.c
diff --git
a/LUFA/Drivers/USB/Core/USBTask.c
b/LUFA/Drivers/USB/Core/USBTask.c
index
b0b6914
..
be14611
100644
(file)
--- a/
LUFA/Drivers/USB/Core/USBTask.c
+++ b/
LUFA/Drivers/USB/Core/USBTask.c
@@
-45,34
+45,32
@@
volatile uint8_t USB_DeviceState;
void USB_USBTask(void)
{
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 (USB_CurrentMode == USB_MODE_Device)
USB_DeviceTask();
- #if defined(USB_CAN_BE_HOST)
else if (USB_CurrentMode == USB_MODE_Host)
USB_HostTask();
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)
{
#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
}
#endif