From 96fd39eda86e963177cb7895f6c2216ecb9c732a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 13 May 2012 10:13:24 +0000 Subject: Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay). --- LUFA/DoxygenPages/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index f8e1b8f48..79d70ad27 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -66,6 +66,7 @@ * defined (thanks to Steven Morehouse) * - Fixed AVRISP-MKII programmer project reset line polarity inverted when the generated EEP file is loaded into the USB AVR's EEPROM and avr-dude is used * - Fixed CDC and DFU bootloaders failing to compile when the bootloader section size is 8KB or more (thanks to Georg Glock) + * - Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay) * - Fixed incorrect DFU version number reported to the host in the DFU bootloader descriptors (thanks to Georg Glock) * - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock) * -- cgit v1.2.3 From 380f014c4c7b3e317181654577b24c41c266bf8f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 13 May 2012 13:06:11 +0000 Subject: Added build test to verify correct compilation of all bootloaders using all supported devices. Fixed compile error with the unreleased ATMEGA32U6 device. --- LUFA/DoxygenPages/ChangeLog.txt | 3 +++ LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 79d70ad27..ffc4dfee7 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -15,6 +15,9 @@ * - Added support for the Olimex AVR-USB-T32U4 board * - Added new Endpoint_ConfigureEndpointTable() function * - Added new Pipe_ConfigurePipeTable() function + * - Added build test to verify correct compilation of all board drivers using all driver APIs + * - Added build test to verify correct compilation of all bootloaders using all supported devices + * - Added build test to verify that there are no detectable errors in the codebase via static analysis * - Library Applications: * - Modified the CDC Host demos to set a default CDC Line Encoding on enumerated devices * - Added Dataflash operational checks and aborts to all projects using the Dataflash to ensure it is working correctly before use diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h index 37ff220e3..056981a27 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h @@ -216,9 +216,9 @@ static inline uint16_t Endpoint_BytesInEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline uint16_t Endpoint_BytesInEndpoint(void) { - #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) + #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) && !defined(__AVR_ATmega32U6__) return UEBCX; - #elif defined(USB_SERIES_4_AVR) + #elif defined(USB_SERIES_4_AVR) || defined(__AVR_ATmega32U6__) return (((uint16_t)UEBCHX << 8) | UEBCLX); #elif defined(USB_SERIES_2_AVR) return UEBCLX; -- cgit v1.2.3