diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-26 15:54:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-26 15:54:11 +0000 |
| commit | 6f01b6afd5a4fbd0a618f790e0afaa5eb2531e12 (patch) | |
| tree | 53ece1aef3409d4dc0f26ec113af110cc809d866 /LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h | |
| parent | a318f32b310eac95a4a208a0f25fb1c39afa22f5 (diff) | |
| download | lufa-6f01b6afd5a4fbd0a618f790e0afaa5eb2531e12.tar.gz lufa-6f01b6afd5a4fbd0a618f790e0afaa5eb2531e12.tar.bz2 lufa-6f01b6afd5a4fbd0a618f790e0afaa5eb2531e12.zip | |
More UC3B architecture port updates.
Diffstat (limited to 'LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h')
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h index d68b6e893..7d4802722 100644 --- 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.
#endif
- #if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
- #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
- #endif
-
/* Public Interface - May be used in end-application: */
/* Macros: */
/** \name USB Device Mode Option Masks */
@@ -209,7 +205,7 @@ static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
{
- AVR32_USBB.UDCON = (AVR32_USBB_UDCON & ~AVR32_USBB_UDADDR) | Address;
+ AVR32_USBB.udcon = (AVR32_USBB.udcon & ~AVR32_USBB_UADD_MASK) | Address;
AVR32_USBB.UDCON.adden = true;
}
|