Remove unsupported devices from the BootloaderTest build test.

[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..8882a02 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -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
@@ -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.
                 */
@@ -170,7 +175,7 @@
                        #elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__))
                                #define USB_SERIES_4_AVR
                                #define USB_CAN_BE_DEVICE
-                       #elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
+                       #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
                                #define USB_SERIES_6_AVR
                                #define USB_CAN_BE_DEVICE
                        #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__))
@@ -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