diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:06:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:06:11 +0000 |
| commit | 380f014c4c7b3e317181654577b24c41c266bf8f (patch) | |
| tree | c2b820da79d77809c0001f16527c902b27fdbe7f /LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h | |
| parent | 96fd39eda86e963177cb7895f6c2216ecb9c732a (diff) | |
| download | lufa-380f014c4c7b3e317181654577b24c41c266bf8f.tar.gz lufa-380f014c4c7b3e317181654577b24c41c266bf8f.tar.bz2 lufa-380f014c4c7b3e317181654577b24c41c266bf8f.zip | |
Added build test to verify correct compilation of all bootloaders using all supported devices.
Fixed compile error with the unreleased ATMEGA32U6 device.
Diffstat (limited to 'LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h')
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |