Added start of a port of the core USB driver code to the AVR32 UC3B architecture.

LUFA/Common/Architectures.h

@@ -62,8 +62,11 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** Selects the Atmel 8-bit AVR (AT90USB* and ATMEGA*U* chips) architecture. */
-			#define ARCH_AVR8           1
+			#define ARCH_AVR8           0
 
+			/** Selects the Atmel 32-bit UC3B AVR (AT32UC3B* chips) architecture. */
+			#define ARCH_UC3B           1
+			
 			#if !defined(__DOXYGEN__)
 				#define ARCH_           ARCH_AVR8
 

LUFA/Common/BoardTypes.h

@@ -144,6 +144,9 @@
 			/** Selects the Sparkfun ATMEGA8U2 specific board drivers, including the driver for the board LEDs. */
 			#define BOARD_SPARKFUN8U2   26
 
+			/** Selects the Atmel EVK1101 specific board drivers, including the Button, Joystick and LED drivers. */
+			#define BOARD_EVK1101       27
+			
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
 

LUFA/Common/Common.h

@@ -67,6 +67,7 @@
 		#include <stdint.h>
 		#include <stdbool.h>
 		#include <string.h>
+		#include <stddef.h>
 		
 		#include "Architectures.h"
 		#include "Attributes.h"
@@ -81,6 +82,16 @@
 			#include <avr/boot.h>
 			#include <util/atomic.h>
 			#include <util/delay.h>
+			
+			typedef uint8_t uintN_t;
+			typedef int8_t  intN_t;
+		#elif (ARCH == ARCH_UC3B)
+			#include <avr32/io.h>
+
+			typedef uint32_t uintN_t;
+			typedef int32_t  intN_t;
+			
+			#warning The UC3B architecture support is currently experimental and incomplete!
 		#endif
 
 	/* Public Interface - May be used in end-application: */

LUFA/Drivers/Board/Buttons.h

@@ -126,6 +126,8 @@
 		#include "MINIMUS/Buttons.h"
 	#elif (BOARD == BOARD_MICROSIN162)
 		#include "MICROSIN162/Buttons.h"
+	#elif (BOARD == BOARD_EVK1101)
+		#include "EVK1101/Buttons.h"
 	#else
 		#include "Board/Buttons.h"
 	#endif

LUFA/Drivers/Board/EVK1101/Buttons.h

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific Buttons driver header for the Atmel EVK1101.
+ *  \copydetails Group_Buttons_EVK1101
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
+ *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
+ */
+
+/** \ingroup Group_Buttons
+ *  \defgroup Group_Buttons_EVK1101 EVK1101
+ *  \brief Board specific Buttons driver header for the Atmel EVK1101.
+ *
+ *  Board specific Buttons driver header for the Atmel EVK1101.
+ *
+ *  @{
+ */
+ 
+#ifndef __BUTTONS_EVK1101_H__
+#define __BUTTONS_EVK1101_H__
+
+	/* Includes: */
+		#include <avr32/io.h>
+		#include <stdbool.h>
+
+		#include "../../../Common/Common.h"
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(INCLUDE_FROM_BUTTONS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
+		#endif
+		
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define BUTTONS_PORT          1
+	#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** Mask of the first button on the board */
+			#define BUTTONS_BUTTON1       (1UL << 2)
+
+			/** Mask of the second button on the board */
+			#define BUTTONS_BUTTON2       (1UL << 3)
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void Buttons_Init(void)
+			{
+				AVR32_GPIO.port[BUTTONS_PORT].gpers  = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
+				AVR32_GPIO.port[BUTTONS_PORT].puers  = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
+			}
+
+			static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uintN_t Buttons_GetStatus(void)
+			{
+				return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+			
+#endif
+
+/** @} */

LUFA/Drivers/Board/EVK1101/Joystick.h

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific joystick driver header for the Atmel EVK1101.
+ *  \copydetails Group_Joystick_EVK1101
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
+ *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
+ */
+
+/** \ingroup Group_Joystick
+ *  \defgroup Group_Joystick_EVK1101 EVK1101
+ *  \brief Board specific joystick driver header for the Atmel EVK1101.
+ *
+ *  Board specific joystick driver header for the Atmel EVK1101.
+ *
+ *  @{
+ */
+ 
+#ifndef __JOYSTICK_EVK1101_H__
+#define __JOYSTICK_EVK1101_H__
+
+	/* Includes: */
+		#include <avr32/io.h>
+
+		#include "../../../Common/Common.h"
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(INCLUDE_FROM_JOYSTICK_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
+		#endif
+
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define JOY_MOVE_PORT            1
+			#define JOY_MOVE_MASK            ((1 << 6) | (1 << 7) | (1 << 8) | (1 << 9))
+			#define JOY_PRESS_PORT           0
+			#define JOY_PRESS_MASK           (1 << 13)
+			
+			#define JOY_SHIFT_LEFT           6
+	#endif
+	
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** Mask for the joystick being pushed in the left direction. */
+			#define JOY_LEFT                 (1 << 1)
+
+			/** Mask for the joystick being pushed in the right direction. */
+			#define JOY_RIGHT                (1 << 2)
+
+			/** Mask for the joystick being pushed in the upward direction. */
+			#define JOY_UP                   (1 << 3)
+
+			/** Mask for the joystick being pushed in the downward direction. */
+			#define JOY_DOWN                 (1 << 4)
+
+			/** Mask for the joystick being pushed inward. */
+			#define JOY_PRESS                (1 << 7)
+			
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void Joystick_Init(void)
+			{
+				AVR32_GPIO.port[JOY_MOVE_PORT].gpers  = JOY_MOVE_MASK;
+				AVR32_GPIO.port[JOY_PRESS_PORT].gpers = JOY_PRESS_MASK;
+
+				AVR32_GPIO.port[JOY_MOVE_PORT].puers  = JOY_MOVE_MASK;
+				AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK;
+			};
+			
+			static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uintN_t Joystick_GetStatus(void)
+			{
+				return (uintN_t)(~(((AVR32_GPIO.port[JOY_MOVE_PORT].pvr  & JOY_MOVE_MASK) |
+				                    (AVR32_GPIO.port[JOY_PRESS_PORT].pvr & JOY_PRESS_MASK)) << JOY_SHIFT_LEFT));
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */

LUFA/Drivers/Board/EVK1101/LEDs.h

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific LED driver header for the Atmel EVK1101.
+ *  \copydetails Group_LEDs_EVK1101
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ */
+
+/** \ingroup Group_LEDs
+ *  \defgroup Group_LEDs_EVK1101 EVK1101
+ *  \brief Board specific LED driver header for the Atmel EVK1101.
+ *
+ *  Board specific LED driver header for the Atmel EVK1101.
+ *
+ *  @{
+ */
+
+#ifndef __LEDS_EVK1101_H__
+#define __LEDS_EVK1101_H__
+
+	/* Includes: */
+		#include <avr32/io.h>
+
+		#include "../../../Common/Common.h"
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(INCLUDE_FROM_LEDS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+		#endif
+
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define LEDS_PORT        0
+	#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** LED mask for the first LED on the board. */
+			#define LEDS_LED1        (1UL << 7)
+
+			/** LED mask for the second LED on the board. */
+			#define LEDS_LED2        (1UL << 8)
+
+			/** LED mask for the third LED on the board. */
+			#define LEDS_LED3        (1UL << 21)
+
+			/** LED mask for the fourth LED on the board. */
+			#define LEDS_LED4        (1UL << 22)
+
+			/** LED mask for all the LEDs on the board. */
+			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
+
+			/** LED mask for the none of the board LEDs */
+			#define LEDS_NO_LEDS     0
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void LEDs_Init(void)
+			{
+				AVR32_GPIO.port[LEDS_PORT].gpers = LEDS_ALL_LEDS;
+				AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS;
+				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
+			}
+			
+			static inline void LEDs_TurnOnLEDs(const uintN_t LedMask)
+			{
+				AVR32_GPIO.port[LEDS_PORT].ovrc  = LedMask;
+			}
+
+			static inline void LEDs_TurnOffLEDs(const uintN_t LedMask)
+			{
+				AVR32_GPIO.port[LEDS_PORT].ovrs  = LedMask;
+			}
+
+			static inline void LEDs_SetAllLEDs(const uintN_t LedMask)
+			{
+				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
+				AVR32_GPIO.port[LEDS_PORT].ovrc  = LedMask;
+			}
+			
+			static inline void LEDs_ChangeLEDs(const uintN_t LedMask, const uintN_t ActiveMask)
+			{
+				AVR32_GPIO.port[LEDS_PORT].ovrs  = LedMask;
+				AVR32_GPIO.port[LEDS_PORT].ovrc  = ActiveMask;
+			}
+			
+			static inline uintN_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uintN_t LEDs_GetLEDs(void)
+			{
+				return (AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+		
+#endif
+
+/** @} */

LUFA/Drivers/Board/EVK527/LEDs.h

@@ -127,4 +127,3 @@
 #endif
 
 /** @} */
-

LUFA/Drivers/Board/Joystick.h

@@ -114,6 +114,8 @@
 		#include "BUMBLEB/Joystick.h"
 	#elif (BOARD == BOARD_EVK527)
 		#include "EVK527/Joystick.h"
+	#elif (BOARD == BOARD_EVK1101)
+		#include "EVK1101/Joystick.h"
 	#else
 		#include "Board/Joystick.h"
 	#endif

LUFA/Drivers/Board/LEDs.h

@@ -166,6 +166,8 @@
 		#include "MICROSIN162/LEDs.h"
 	#elif (BOARD == BOARD_SPARKFUN8U2)
 		#include "SPARKFUN8U2/LEDs.h"
+	#elif (BOARD == BOARD_EVK1101)
+		#include "EVK1101/LEDs.h"
 	#else
 		#include "Board/LEDs.h"
 	#endif

LUFA/Drivers/USB/Core/AVR8/Endpoint.h

@@ -197,11 +197,6 @@
 			 */
 			#define ENDPOINT_EPDIR_MASK                     0x80
 
-			/** Endpoint bank size mask, for masking against endpoint addresses to retrieve the endpoint's
-			 *  bank size in the device.
-			 */
-			#define ENDPOINT_EPSIZE_MASK                    0x7F
-
 			/** Retrives the maximum bank size in bytes of a given endpoint.
 			 *
 			 *  \note This macro will only work correctly on endpoint indexes that are compile-time constants
@@ -306,7 +301,7 @@
 			                                              const uint16_t Size,
 			                                              const uint8_t Banks)
 			{
-				return Endpoint_ConfigureEndpoint_Prv(Number, (((Type) << EPTYPE0) | (Direction)),
+				return Endpoint_ConfigureEndpoint_Prv(Number, ((Type << EPTYPE0) | Direction),
 				                                      ((1 << ALLOC) | Banks | Endpoint_BytesToEPSizeMask(Size)));
 			}
 
@@ -406,6 +401,19 @@
 				return ((UECONX & (1 << EPEN)) ? true : false);
 			}
 
+			/** Retrieves the number of busy banks in the currently selected endpoint, which have been queued for
+			 *  transmission via the \ref Endpoint_ClearIN() command, or are awaiting acknowledgement via the
+			 *  \ref Endpoint_ClearOUT() command.
+			 *
+			 *  \ingroup Group_EndpointPacketManagement_AVR8
+			 *
+			 *  \return Total number of busy banks in the selected endpoint.
+			 */
+			static inline uint8_t Endpoint_GetBusyBanks(void)
+			{
+				return (UESTA0X & (0x03 << NBUSYBK0));
+			}
+
 			/** Aborts all pending IN transactions on the currently selected endpoint, once the bank
 			 *  has been queued for transmission to the host via \ref Endpoint_ClearIN(). This function
 			 *  will terminate all queued transactions, resetting the endpoint banks ready for a new
@@ -415,25 +423,12 @@
 			 */
 			static inline void Endpoint_AbortPendingIN(void)
 			{
-				while (UESTA0X & (0x03 << NBUSYBK0))
+				while (Endpoint_GetBusyBanks() != 0)
 				{
 					UEINTX |= (1 << RXOUTI);
 					while (UEINTX & (1 << RXOUTI));
 				}
 			}
-			
-			/** Retrieves the number of busy banks in the currently selected endpoint, which have been queued for
-			 *  transmission via the \ref Endpoint_ClearIN() command, or are awaiting acknowledgement via the
-			 *  \ref Endpoint_ClearOUT() command.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Total number of busy banks in the selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetBusyBanks(void)
-			{
-				return (UESTA0X & (0x03 << NBUSYBK0));
-			}
 
 			/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
 			 *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN
@@ -484,7 +479,7 @@
 			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
 			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber)
 			{
-				return ((UEINT & (1 << EndpointNumber)) ? true : false);
+				return ((Endpoint_GetEndpointInterrupts() & (1 << EndpointNumber)) ? true : false);
 			}
 
 			/** Determines if the selected IN endpoint is ready for a new packet to be sent to the host.

LUFA/Drivers/USB/Core/AVR8/USBInterrupt.h

@@ -57,31 +57,31 @@
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
-			#define USB_INT_Enable(int)              MACROS{ USB_INT_GET_EN_REG(int)   |=   USB_INT_GET_EN_MASK(int);   }MACROE
-			#define USB_INT_Disable(int)             MACROS{ USB_INT_GET_EN_REG(int)   &= ~(USB_INT_GET_EN_MASK(int));  }MACROE
-			#define USB_INT_Clear(int)               MACROS{ USB_INT_GET_INT_REG(int)  &= ~(USB_INT_GET_INT_MASK(int)); }MACROE
-			#define USB_INT_IsEnabled(int)                 ((USB_INT_GET_EN_REG(int)   &    USB_INT_GET_EN_MASK(int)) ? true : false)
-			#define USB_INT_HasOccurred(int)               ((USB_INT_GET_INT_REG(int)  &    USB_INT_GET_INT_MASK(int)) ? true : false)
+			#define USB_INT_Enable(int)       MACROS{ USB_INT_GET_EN_REG(int)   |=   USB_INT_GET_EN_MASK(int);   }MACROE
+			#define USB_INT_Disable(int)      MACROS{ USB_INT_GET_EN_REG(int)   &= ~(USB_INT_GET_EN_MASK(int));  }MACROE
+			#define USB_INT_Clear(int)        MACROS{ USB_INT_GET_INT_REG(int)  &= ~(USB_INT_GET_INT_MASK(int)); }MACROE
+			#define USB_INT_IsEnabled(int)          ((USB_INT_GET_EN_REG(int)   &    USB_INT_GET_EN_MASK(int))  ? true : false)
+			#define USB_INT_HasOccurred(int)        ((USB_INT_GET_INT_REG(int)  &    USB_INT_GET_INT_MASK(int)) ? true : false)
 
 			#define USB_INT_GET_EN_REG(EnableReg, EnableMask, FlagReg, FlagMask)    EnableReg
 			#define USB_INT_GET_EN_MASK(EnableReg, EnableMask, FlagReg, FlagMask)   EnableMask
 			#define USB_INT_GET_INT_REG(EnableReg, EnableMask, FlagReg, FlagMask)   FlagReg
 			#define USB_INT_GET_INT_MASK(EnableReg, EnableMask, FlagReg, FlagMask)  FlagMask
 			
-			#define USB_INT_VBUS                             USBCON, (1 << VBUSTE) , USBINT, (1 << VBUSTI)
-			#define USB_INT_IDTI                             USBCON, (1 << IDTE)   , USBINT, (1 << IDTI)
-			#define USB_INT_WAKEUPI                          UDIEN , (1 << WAKEUPE), UDINT , (1 << WAKEUPI)
-			#define USB_INT_SUSPI                            UDIEN , (1 << SUSPE)  , UDINT , (1 << SUSPI)
-			#define USB_INT_EORSTI                           UDIEN , (1 << EORSTE) , UDINT , (1 << EORSTI)
-			#define USB_INT_DCONNI                           UHIEN , (1 << DCONNE) , UHINT , (1 << DCONNI)
-			#define USB_INT_DDISCI                           UHIEN , (1 << DDISCE) , UHINT , (1 << DDISCI)
-			#define USB_INT_BCERRI                           OTGIEN, (1 << BCERRE) , OTGINT, (1 << BCERRI)
-			#define USB_INT_VBERRI                           OTGIEN, (1 << VBERRE) , OTGINT, (1 << VBERRI)
-			#define USB_INT_SOFI                             UDIEN,  (1 << SOFE)   , UDINT , (1 << SOFI)
-			#define USB_INT_HSOFI                            UHIEN,  (1 << HSOFE)  , UHINT , (1 << HSOFI)
-			#define USB_INT_RSTI                             UHIEN , (1 << RSTE)   , UHINT , (1 << RSTI)
-			#define USB_INT_SRPI                             OTGIEN, (1 << SRPE)   , OTGINT, (1 << SRPI)
-			#define USB_INT_RXSTPI                           UEIENX, (1 << RXSTPE) , UEINTX, (1 << RXSTPI)
+			#define USB_INT_VBUS     USBCON, (1 << VBUSTE) , USBINT, (1 << VBUSTI)
+			#define USB_INT_IDTI     USBCON, (1 << IDTE)   , USBINT, (1 << IDTI)
+			#define USB_INT_WAKEUPI  UDIEN , (1 << WAKEUPE), UDINT , (1 << WAKEUPI)
+			#define USB_INT_SUSPI    UDIEN , (1 << SUSPE)  , UDINT , (1 << SUSPI)
+			#define USB_INT_EORSTI   UDIEN , (1 << EORSTE) , UDINT , (1 << EORSTI)
+			#define USB_INT_DCONNI   UHIEN , (1 << DCONNE) , UHINT , (1 << DCONNI)
+			#define USB_INT_DDISCI   UHIEN , (1 << DDISCE) , UHINT , (1 << DDISCI)
+			#define USB_INT_BCERRI   OTGIEN, (1 << BCERRE) , OTGINT, (1 << BCERRI)
+			#define USB_INT_VBERRI   OTGIEN, (1 << VBERRE) , OTGINT, (1 << VBERRI)
+			#define USB_INT_SOFI     UDIEN,  (1 << SOFE)   , UDINT , (1 << SOFI)
+			#define USB_INT_HSOFI    UHIEN,  (1 << HSOFE)  , UHINT , (1 << HSOFI)
+			#define USB_INT_RSTI     UHIEN , (1 << RSTE)   , UHINT , (1 << RSTI)
+			#define USB_INT_SRPI     OTGIEN, (1 << SRPE)   , OTGINT, (1 << SRPI)
+			#define USB_INT_RXSTPI   UEIENX, (1 << RXSTPE) , UEINTX, (1 << RXSTPI)
 
 		/* Includes: */
 			#include "../USBMode.h"

LUFA/Drivers/USB/Core/Device.h

@@ -57,6 +57,8 @@
 		
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/Device.h"
+		#elif (ARCH == ARCH_UC3B)
+			#include "UC3B/Device.h"		
 		#endif
 
 	/* Preprocessor Checks: */

LUFA/Drivers/USB/Core/Endpoint.h

@@ -77,6 +77,8 @@
 
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/Endpoint.h"
+		#elif (ARCH == ARCH_UC3B)
+			#include "UC3B/Endpoint.h"		
 		#endif
 
 	/* Preprocessor Checks: */

LUFA/Drivers/USB/Core/Host.h

@@ -54,6 +54,8 @@
 
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/Host.h"
+		#elif (ARCH == ARCH_UC3B)
+			#include "UC3B/Host.h"		
 		#endif
 
 	/* Preprocessor Checks: */

LUFA/Drivers/USB/Core/OTG.h

@@ -55,6 +55,8 @@
 
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/OTG.h"
+		#elif (ARCH == ARCH_UC3B)
+			#include "UC3B/OTG.h"		
 		#endif
 
 	/* Preprocessor Checks: */

LUFA/Drivers/USB/Core/Pipe.h

@@ -87,6 +87,8 @@
 
 		#if (ARCH == ARCH_AVR8)