More AVR32 UC3B architecture ports - USB device mode applications can now be sucessfu...

[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 7d48027..73abc10 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
@@ -82,23 +82,16 @@
                        #define USB_DEVICE_OPT_FULLSPEED               (0 << 0)\r
                        //@}\r
                        \r
-                       #if (!defined(NO_INTERNAL_SERIAL) && \\r
-                            (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__) || \\r
-                             defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__)  || defined(__AVR_AT90USB1286__) ||  \\r
-                             defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__)  || defined(__AVR_ATmega8U2__)))\r
-                               /** String descriptor index for the device's unique serial number string descriptor within the device.\r
-                                *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port\r
-                                *  number allocations) to a device regardless of the port it is plugged in to on the host. Some USB AVRs contain\r
-                                *  a unique serial number internally, and setting the device descriptors serial number string index to this value\r
-                                *  will cause it to use the internal serial number.\r
-                                *\r
-                                *  On unsupported devices, this will evaluate to NO_DESCRIPTOR and so will force the host to create a pseudo-serial\r
-                                *  number for the device.\r
-                                */\r
-                               #define USE_INTERNAL_SERIAL           0xDC\r
-                       #else\r
-                               #define USE_INTERNAL_SERIAL           NO_DESCRIPTOR\r
-                       #endif                  \r
+                       /** String descriptor index for the device's unique serial number string descriptor within the device.\r
+                        *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port\r
+                        *  number allocations) to a device regardless of the port it is plugged in to on the host. Some USB AVRs contain\r
+                        *  a unique serial number internally, and setting the device descriptors serial number string index to this value\r
+                        *  will cause it to use the internal serial number.\r
+                        *\r
+                        *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial\r
+                        *  number for the device.\r
+                        */\r
+                       #define USE_INTERNAL_SERIAL                    NO_DESCRIPTOR\r
                        \r
                /* Function Prototypes: */\r
                        /** Sends a Remote Wakeup request to the host. This signals to the host that the device should\r
@@ -205,7 +198,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_UADD_MASK) | Address;\r
+                               AVR32_USBB.UDCON.uadd  = Address;\r
                                AVR32_USBB.UDCON.adden = true;\r
                        }\r
 \r