diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:13:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:13:45 +0000 |
| commit | 5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e (patch) | |
| tree | d3eb8d67b632e47885ede0b25199433084cff1d1 /LUFA | |
| parent | 40fd566dbaa76b1b40677cc826da2e89af424aa2 (diff) | |
| parent | 998009c490409ed4419d3f3d6e43313826bc1796 (diff) | |
| download | lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.tar.gz lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.tar.bz2 lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.zip | |
AppConfigHeaders: Merge in latest trunk.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/DoxygenPages/ChangeLog.txt | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index f8e1b8f48..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 @@ -66,6 +69,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) * 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; |