Commit c619e21f authored by Dean Camera's avatar Dean Camera
Browse files

Added support for the new ATMEGA32U2, ATMEGA16U2 and ATMEGA8U2 AVR models.

parent 32086e4f
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
#define USB_DEVICE_ONLY #define USB_DEVICE_ONLY
#endif #endif
#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__)) #if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))
#define USB_SERIES_2_AVR #define USB_SERIES_2_AVR
#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
#define USB_SERIES_4_AVR #define USB_SERIES_4_AVR
...@@ -57,15 +58,19 @@ ...@@ -57,15 +58,19 @@
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#elif defined(USB_HOST_ONLY) #elif defined(USB_HOST_ONLY)
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#define USB_CurrentMode USB_MODE_HOST #define USB_CurrentMode USB_MODE_HOST
#elif defined(USB_DEVICE_ONLY) #elif defined(USB_DEVICE_ONLY)
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CurrentMode USB_MODE_DEVICE #define USB_CurrentMode USB_MODE_DEVICE
#endif #endif
#if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__)) && defined(USB_HOST_ONLY)) #if (!defined(USB_SERIES_7_AVR) && defined(USB_HOST_ONLY))
#error USB_HOST_ONLY is not available for the currently selected USB AVR model. #error USB_HOST_ONLY is not available for the currently selected USB AVR model.
#elif (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY)) #endif
#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive. #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
#endif #endif
......
...@@ -76,6 +76,8 @@ ...@@ -76,6 +76,8 @@
#if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \ #if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \ defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \ defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || \
defined(__AVR_ATmega8U2__) || \
defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || \ defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || \
defined(__AVR_ATmega32U6__))) defined(__AVR_ATmega32U6__)))
#error The currently selected AVR model is not supported under the USB component of the LUFA library. #error The currently selected AVR model is not supported under the USB component of the LUFA library.
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* - Added stdio stream demo code to the low-level CDC demo, to show how to create standard streams out of the virtual serial ports * - Added stdio stream demo code to the low-level CDC demo, to show how to create standard streams out of the virtual serial ports
* - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions * - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions
* - Added new USE_FLASH_DESCRIPTORS and TOTAL_NUM_CONFIGURATIONS compile time options * - Added new USE_FLASH_DESCRIPTORS and TOTAL_NUM_CONFIGURATIONS compile time options
* - Added support for the new ATMEGA32U2, ATMEGA16U2 and ATMEGA8U2 AVR models
* *
* <b>Changed:</b> * <b>Changed:</b>
* - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused) * - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)
......
...@@ -8,15 +8,18 @@ ...@@ -8,15 +8,18 @@
* \page Page_DeviceSupport Device and Hardware Support * \page Page_DeviceSupport Device and Hardware Support
* *
* Currently supported AVR models: * Currently supported AVR models:
* - AT90USB1286 (USB Device Only)
* - AT90USB1287 (USB Host and Device)
* - AT90USB646 (USB Device Only)
* - AT90USB647 (USB Host and Device)
* - AT90USB82 (USB Device Only) * - AT90USB82 (USB Device Only)
* - ATMEGA8U2 (USB Device Only)
* - AT90USB162 (USB Device Only) * - AT90USB162 (USB Device Only)
* - ATMEGA16U2 (USB Device Only)
* - ATMEGA16U4 (USB Device Only) * - ATMEGA16U4 (USB Device Only)
* - ATMEGA32U2 (USB Device Only)
* - ATMEGA32U4 (USB Device Only) * - ATMEGA32U4 (USB Device Only)
* - ATMEGA32U6 (USB Device Only) * - ATMEGA32U6 (USB Device Only)
* - AT90USB646 (USB Device Only)
* - AT90USB647 (USB Host and Device)
* - AT90USB1286 (USB Device Only)
* - AT90USB1287 (USB Host and Device)
* *
* Currently supported Atmel boards: * Currently supported Atmel boards:
* - AT90USBKEY * - AT90USBKEY
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment