diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-08-28 20:09:14 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-08-28 20:09:14 +0000 |
| commit | 44aea22949c40e76b8be6cb56acbd2b155043e6b (patch) | |
| tree | ce9537d7baf57caeb8c871b7d91abd0fa7693f6b /LUFA/Drivers/USB/Core/USBTask.c | |
| parent | e225de8a8372fa2cc5dc1d2d782cf7af0f3c0f08 (diff) | |
| download | lufa-44aea22949c40e76b8be6cb56acbd2b155043e6b.tar.gz lufa-44aea22949c40e76b8be6cb56acbd2b155043e6b.tar.bz2 lufa-44aea22949c40e76b8be6cb56acbd2b155043e6b.zip | |
Fixed logic hole breaking USB operations on a USB controller with only one supported USB mode and no USB_DEVICE_ONLY or USB_HOST_ONLY configuration token set.
Diffstat (limited to 'LUFA/Drivers/USB/Core/USBTask.c')
| -rw-r--r-- | LUFA/Drivers/USB/Core/USBTask.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/LUFA/Drivers/USB/Core/USBTask.c b/LUFA/Drivers/USB/Core/USBTask.c index b0b6914af..71ae47d02 100644 --- a/LUFA/Drivers/USB/Core/USBTask.c +++ b/LUFA/Drivers/USB/Core/USBTask.c @@ -45,17 +45,15 @@ 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 } |