diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-03 10:49:44 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-03 10:49:44 +0000 |
commit | 7d037c7db812be4dac1a742c990f3631fbd82cb5 (patch) | |
tree | c1ff95de90e015a809d39231f0f02c300d8e52fe /LUFA/Drivers/USB/Core | |
parent | 04d13d264c924d5c3380076f8977ca2dd0b14fd8 (diff) | |
download | lufa-7d037c7db812be4dac1a742c990f3631fbd82cb5.tar.gz lufa-7d037c7db812be4dac1a742c990f3631fbd82cb5.tar.bz2 lufa-7d037c7db812be4dac1a742c990f3631fbd82cb5.zip |
Remove support for devices that were not put into production.
Diffstat (limited to 'LUFA/Drivers/USB/Core')
-rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h | 8 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h | 4 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Core/USBMode.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h index 876a2aac6..de53c21ab 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h @@ -203,10 +203,10 @@ const uint8_t Banks) { uint8_t Number = (Address & ENDPOINT_EPNUM_MASK); - + if (Number >= ENDPOINT_TOTAL_ENDPOINTS) return false; - + return Endpoint_ConfigureEndpoint_Prv(Number, ((Type << EPTYPE0) | ((Address & ENDPOINT_DIR_IN) ? (1 << EPDIR) : 0)), ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Endpoint_BytesToEPSizeMask(Size))); @@ -221,9 +221,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)) && !defined(__AVR_ATmega32U6__) + #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) return UEBCX; - #elif defined(USB_SERIES_4_AVR) || defined(__AVR_ATmega32U6__) + #elif defined(USB_SERIES_4_AVR) return (((uint16_t)UEBCHX << 8) | UEBCLX); #elif defined(USB_SERIES_2_AVR) return UEBCLX; diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h index 3e1618811..74d58f7c2 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h @@ -91,7 +91,7 @@ #define USB_PLL_PSC 0 #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) #define USB_PLL_PSC 0 - #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) || defined(__AVR_ATmega32U6__)) + #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) #define USB_PLL_PSC ((1 << PLLP1) | (1 << PLLP0)) #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)) #define USB_PLL_PSC ((1 << PLLP1) | (1 << PLLP0)) @@ -103,7 +103,7 @@ #define USB_PLL_PSC (1 << PLLP0) #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) #define USB_PLL_PSC (1 << PINDIV) - #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_ATmega32U6__)) + #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)) #define USB_PLL_PSC ((1 << PLLP2) | (1 << PLLP1)) #elif (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)) #define USB_PLL_PSC ((1 << PLLP2) | (1 << PLLP0)) diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h index 6fe7c062e..8882a02e4 100644 --- a/LUFA/Drivers/USB/Core/USBMode.h +++ b/LUFA/Drivers/USB/Core/USBMode.h @@ -106,7 +106,7 @@ * (i.e. AT32UC3A4*) when defined. */ #define USB_SERIES_UC3A4_AVR - + /** Indicates that the target AVR microcontroller belongs to the AVR32 UC3B0 Series USB controller * (i.e. AT32UC3B0*) when defined. */ @@ -175,7 +175,7 @@ #elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__)) #define USB_SERIES_4_AVR #define USB_CAN_BE_DEVICE - #elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) + #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) #define USB_SERIES_6_AVR #define USB_CAN_BE_DEVICE #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)) |