From f670bdeff83ee519b67c661cbe794d787c2a5403 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 25 Apr 2011 07:28:36 +0000 Subject: Add __VA_ARGS__ support to the LUFA supplied ISR macro. Add proper result typecasting to the SWAPENDIAN_* macros. Switch to using -1 on the UC3 target to obtain a register mask with all bits set (for clearing interrupts and status flags). Fix incorrect USB controller mode on the UC3 when a fixed mode is specified as a compile time option due to AVR32_USBB.USBCON.uide being set by default. Make USB_Descriptor_String_t use a uint16_t for Unicode strings on all targets except the AVR8 (retained for backwards compatibility). --- LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c') diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c index 76f4ef022..5191ee67f 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c @@ -36,8 +36,8 @@ void USB_INT_DisableAllInterrupts(void) AVR32_USBB.USBCON.vbuste = false; AVR32_USBB.USBCON.idte = false; - AVR32_USBB.uhinteclr = 0xFFFFFFFF; - AVR32_USBB.udinteclr = 0xFFFFFFFF; + AVR32_USBB.uhinteclr = -1; + AVR32_USBB.udinteclr = -1; } void USB_INT_ClearAllInterrupts(void) @@ -45,8 +45,8 @@ void USB_INT_ClearAllInterrupts(void) AVR32_USBB.USBSTACLR.vbustic = true; AVR32_USBB.USBSTACLR.idtic = true; - AVR32_USBB.uhintclr = 0xFFFFFFFF; - AVR32_USBB.udintclr = 0xFFFFFFFF; + AVR32_USBB.uhintclr = -1; + AVR32_USBB.udintclr = -1; } ISR(USB_GEN_vect) -- cgit v1.2.3