Mark build test makefiles as being incompatible with parallel make builds, as they...

[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 0013077..f62c8c1 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -137,6 +137,16 @@
                 */
                #define USB_SERIES_B3_XMEGA
 
                 */
                #define USB_SERIES_B3_XMEGA
 

+               /** Indicates that the target AVR microcontroller belongs to the XMEGA C3 Series USB controller
+                *  (i.e. ATXMEGA*C3) when defined.
+                */
+               #define USB_SERIES_C3_XMEGA
+
+               /** Indicates that the target AVR microcontroller belongs to the XMEGA C4 Series USB controller
+                *  (i.e. ATXMEGA*C4) when defined.
+                */
+               #define USB_SERIES_C4_XMEGA
+

                /** Indicates that the target microcontroller and compilation settings allow for the
                 *  target to be configured in USB Device mode when defined.
                 */
                /** Indicates that the target microcontroller and compilation settings allow for the
                 *  target to be configured in USB Device mode when defined.
                 */


@@ -209,7 +219,8 @@
                        #elif (defined(__AVR_ATxmega256A3BU__))
                                #define USB_SERIES_A3BU_XMEGA
                                #define USB_CAN_BE_DEVICE
                        #elif (defined(__AVR_ATxmega256A3BU__))
                                #define USB_SERIES_A3BU_XMEGA
                                #define USB_CAN_BE_DEVICE

-                       #elif (defined(__AVR_ATxmega16A4U__) || defined(__AVR_ATxmega32A4U__))
+                       #elif (defined(__AVR_ATxmega16A4U__) || defined(__AVR_ATxmega32A4U__) || \
+                              defined(__AVR_ATxmega64A4U__) || defined(__AVR_ATxmega128A4U__))

                                #define USB_SERIES_A4U_XMEGA
                                #define USB_CAN_BE_DEVICE
                        #elif (defined(__AVR_ATxmega128B1__) || defined(__AVR_ATxmega64B1__))
                                #define USB_SERIES_A4U_XMEGA
                                #define USB_CAN_BE_DEVICE
                        #elif (defined(__AVR_ATxmega128B1__) || defined(__AVR_ATxmega64B1__))


@@ -218,6 +229,14 @@
                        #elif (defined(__AVR_ATxmega128B3__) || defined(__AVR_ATxmega64B3__))
                                #define USB_SERIES_B3_XMEGA
                                #define USB_CAN_BE_DEVICE
                        #elif (defined(__AVR_ATxmega128B3__) || defined(__AVR_ATxmega64B3__))
                                #define USB_SERIES_B3_XMEGA
                                #define USB_CAN_BE_DEVICE

+                       #elif (defined(__AVR_ATxmega128C3__) || defined(__AVR_ATxmega64C3__) || \
+                              defined(__AVR_ATxmega192C3__) || defined(__AVR_ATxmega256C3__) || \
+                                  defined(__AVR_ATxmega384C3__))
+                               #define USB_SERIES_C3_XMEGA
+                               #define USB_CAN_BE_DEVICE
+                       #elif (defined(__AVR_ATxmega16C4__) || defined(__AVR_ATxmega32C4__))
+                               #define USB_SERIES_C4_XMEGA
+                               #define USB_CAN_BE_DEVICE

                        #endif
 
                        #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
                        #endif
 
                        #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))