Use an early-abort in the USB_DeviceTask() function rather than wrapping the entire...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / USBMode.h

diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index 1b1d9dc..5de57ff 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -102,6 +102,11 @@
                 */
                #define USB_SERIES_UC3A3_AVR
 
+               /** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A4 Series USB controller
+                *  (i.e. AT32UC3A4*) when defined.
+                */
+               #define USB_SERIES_UC3A4_AVR
+               
                /** Indicates that the target AVR microcontroller belongs to the AVR32 UC3B0 Series USB controller
                 *  (i.e. AT32UC3B0*) when defined.
                 */
@@ -239,40 +244,28 @@
                                #define USB_CAN_BE_DEVICE
                        #endif
 
-                       #if ( defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
-                               #if !defined(USB_DEVICE_ONLY)
-                                       #define USB_DEVICE_ONLY
-                               #endif
-                       #elif (!defined(USB_CAN_BE_DEVICE) &&  defined(USB_CAN_BE_HOST))
-                               #if !defined(USB_HOST_ONLY)
-                                       #define USB_HOST_ONLY
-                               #endif
-                       #endif
-
-                       #if defined(USB_HOST_ONLY)
+                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
+                               #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
+                       #elif defined(USB_HOST_ONLY)
                                #if !defined(USB_CAN_BE_HOST)
                                        #error USB_HOST_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_DEVICE
-                                       #undef USB_CAN_BE_BOTH
                                #endif
-                       #endif
-
-                       #if defined(USB_DEVICE_ONLY)
+                       #elif defined(USB_DEVICE_ONLY)
                                #if !defined(USB_CAN_BE_DEVICE)
                                        #error USB_DEVICE_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_HOST
-                                       #undef USB_CAN_BE_BOTH
                                #endif
                        #endif
 
-                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
-                               #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
+                       #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+                               #define USB_CAN_BE_BOTH
                        #endif
 
                        #if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
-                               #error The currently selected device or architecture is not supported under the USB component of the library.
+                               #error The currently selected device, USB mode or architecture is not supported.
                        #endif
        #endif