diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-14 07:31:40 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-14 07:31:40 +0000 |
| commit | dc09ccab8bc1b8980eae10153c0a57eca02ce794 (patch) | |
| tree | 5331b79e17bd58785e36c750b6883cbe91ec2472 /LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h | |
| parent | e30be658c9b4d0cbbea6751c3935870165d97444 (diff) | |
| download | lufa-dc09ccab8bc1b8980eae10153c0a57eca02ce794.tar.gz lufa-dc09ccab8bc1b8980eae10153c0a57eca02ce794.tar.bz2 lufa-dc09ccab8bc1b8980eae10153c0a57eca02ce794.zip | |
Minor corrections for the XMEGA USB controller. Add compile time warning if the USB clock frequency is provably incorrect.
Diffstat (limited to 'LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h')
| -rw-r--r-- | LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h index 49bc1f2f6..f587feca9 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h @@ -290,6 +290,10 @@ const uint8_t Banks) { uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | Banks | Endpoint_BytesToEPSizeMask(Size)); + + // TODO - Fix once limitations are lifted + if ((Banks != ENDPOINT_BANK_SINGLE) || (Size > 64)) + return false; switch (Type) { @@ -473,7 +477,7 @@ if (USB_Endpoint_SelectedHandle->STATUS & USB_EP_SETUP_bm) { USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT; - return true; + return true; } return false; @@ -489,8 +493,8 @@ static inline void Endpoint_ClearSETUP(void) ATTR_ALWAYS_INLINE; static inline void Endpoint_ClearSETUP(void) { + Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN); USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_SETUP_bm | USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm); - USB_Endpoint_SelectedHandle->STATUS |= USB_EP_TOGGLE_bm; USB_Endpoint_SelectedFIFO->Position = 0; @@ -543,7 +547,7 @@ if ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) == USB_EP_TYPE_CONTROL_gc) { Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN); - USB_Endpoint_SelectedHandle->STATUS |= USB_EP_STALL_bm; + USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm; Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN); } } @@ -567,7 +571,7 @@ static inline bool Endpoint_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline bool Endpoint_IsStalled(void) { - return ((USB_Endpoint_SelectedHandle->STATUS & USB_EP_STALLF_bm) ? true : false); + return ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_STALL_bm) ? true : false); } /** Resets the data toggle of the currently selected endpoint. */ |