diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-10-04 11:40:55 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-10-04 11:40:55 +0000 |
| commit | 3bb8055459778a834794fab484af350ea7ae0725 (patch) | |
| tree | b5951e16f12d448246b8c1d9020b5674b8016366 /LUFA/Drivers | |
| parent | 3223786c49335e732ed5719510c24b4c50ff8b46 (diff) | |
| download | lufa-3bb8055459778a834794fab484af350ea7ae0725.tar.gz lufa-3bb8055459778a834794fab484af350ea7ae0725.tar.bz2 lufa-3bb8055459778a834794fab484af350ea7ae0725.zip | |
Fix compile errors for the USB XMEGA parts when the USB driver is used.
Add core support for the ATXMEGA64A1U.
Minor documentation corrections.
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/USB/Core/USBMode.h | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h index 189dd6ee0..86746a296 100644 --- a/LUFA/Drivers/USB/Core/USBMode.h +++ b/LUFA/Drivers/USB/Core/USBMode.h @@ -174,12 +174,9 @@ #define USB_SERIES_UC3B1_AVR32 #define USB_CAN_BE_DEVICE #define USB_CAN_BE_HOST - #elif (defined(__AVR_ATxmega128A1U__)) + #elif (defined(__AVR_ATxmega128A1U__) || defined(__AVR_ATxmega64A1U__)) #define USB_SERIES_A1U_XMEGA #define USB_CAN_BE_DEVICE - #elif (defined(__AVR_ATxmega16A4U__) || defined(__AVR_ATxmega32A4U__)) - #define USB_SERIES_A4U_XMEGA - #define USB_CAN_BE_DEVICE #elif (defined(__AVR_ATxmega64A3U__) || defined(__AVR_ATxmega128A3U__) || \ defined(__AVR_ATxmega192A3U__) || defined(__AVR_ATxmega256A3U__)) #define USB_SERIES_A3U_XMEGA @@ -187,6 +184,9 @@ #elif (defined(__AVR_ATxmega256A3BU__)) #define USB_SERIES_A3BU_XMEGA #define USB_CAN_BE_DEVICE + #elif (defined(__AVR_ATxmega16A4U__) || defined(__AVR_ATxmega32A4U__)) + #define USB_SERIES_A4U_XMEGA + #define USB_CAN_BE_DEVICE #endif #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST)) diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h index 15ba8fe35..18fe403e5 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h @@ -275,10 +275,10 @@ uint8_t EPTypeMask = 0; switch (Type) { - case USB_EPTYPE_Control: + case EP_TYPE_CONTROL: EPTypeMask = USB_EP_TYPE_CONTROL_gc; break; - case USB_EPTYPE_Isochronous: + case EP_TYPE_ISOCHRONOUS: EPTypeMask = USB_EP_TYPE_ISOCHRONOUS_gc; break; default: |