More UC3B architecture port updates.

[pub/lufa.git] / LUFA / Drivers / USB / Core / UC3B / Device_UC3B.h

diff --git a/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
index d68b6e8..7d48027 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
@@ -59,10 +59,6 @@
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r
-               #if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))\r
-                       #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r
-               #endif\r
-\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** \name USB Device Mode Option Masks */\r
@@ -209,7 +205,7 @@
                        static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;\r
                        static inline void USB_Device_SetDeviceAddress(const uint8_t Address)\r
                        {\r
-                               AVR32_USBB.UDCON       = (AVR32_USBB_UDCON & ~AVR32_USBB_UDADDR) | Address;\r
+                               AVR32_USBB.udcon       = (AVR32_USBB.udcon & ~AVR32_USBB_UADD_MASK) | Address;\r
                                AVR32_USBB.UDCON.adden = true;\r
                        }\r
 \r