diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-22 08:06:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-22 08:06:52 +0000 |
| commit | b711b7d6a484204098eeccc03845b454bb1ad208 (patch) | |
| tree | eaaed30dd7fc58054d6ba876b2534db8a5a4900f /LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h | |
| parent | eb2e883fd35b5332a7425488105a7adb500ce3fe (diff) | |
| download | lufa-b711b7d6a484204098eeccc03845b454bb1ad208.tar.gz lufa-b711b7d6a484204098eeccc03845b454bb1ad208.tar.bz2 lufa-b711b7d6a484204098eeccc03845b454bb1ad208.zip | |
Fixed broken AVR32 endpoint/pipe communications when ORDERED_EP_CONFIG compile time option is not enabled (thanks to Matthias).
Fixed broken compilation for the AVR32 devices if the NO_SOF_EVENTS compile time option was not enabled (thanks to Matthias).
Diffstat (limited to 'LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h')
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h index 28dbabbfd..c4276d9c1 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h @@ -43,7 +43,6 @@ /* Includes: */ #include "../../../../Common/Common.h" - #include "../Endpoint.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -56,7 +55,10 @@ #endif /* Private Interface - For use in library only: */ - #if !defined(__DOXYGEN__) + #if !defined(__DOXYGEN__) + /* External Variables: */ + extern volatile uint32_t USB_Endpoint_SelectedEndpoint; + /* Enums: */ enum USB_Interrupts_t { @@ -109,7 +111,7 @@ AVR32_USBB.UDINTESET.sofes = true; break; case USB_INT_RXSTPI: - (&AVR32_USBB.UECON0SET)[USB_SelectedEndpoint].rxstpes = true; + (&AVR32_USBB.UECON0SET)[USB_Endpoint_SelectedEndpoint].rxstpes = true; break; #endif #if defined(USB_CAN_BE_HOST) @@ -162,7 +164,7 @@ AVR32_USBB.UDINTECLR.sofec = true; break; case USB_INT_RXSTPI: - (&AVR32_USBB.UECON0CLR)[USB_SelectedEndpoint].rxstpec = true; + (&AVR32_USBB.UECON0CLR)[USB_Endpoint_SelectedEndpoint].rxstpec = true; break; #endif #if defined(USB_CAN_BE_HOST) @@ -221,7 +223,7 @@ (void)AVR32_USBB.UDINTCLR; break; case USB_INT_RXSTPI: - (&AVR32_USBB.UESTA0CLR)[USB_SelectedEndpoint].rxstpic = true; + (&AVR32_USBB.UESTA0CLR)[USB_Endpoint_SelectedEndpoint].rxstpic = true; break; #endif #if defined(USB_CAN_BE_HOST) @@ -274,7 +276,7 @@ case USB_INT_SOFI: return AVR32_USBB.UDINTE.sofe; case USB_INT_RXSTPI: - return (&AVR32_USBB.UECON0)[USB_SelectedEndpoint].rxstpe; + return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].rxstpe; #endif #if defined(USB_CAN_BE_HOST) case USB_INT_HSOFI: @@ -316,7 +318,7 @@ case USB_INT_SOFI: return AVR32_USBB.UDINT.sof; case USB_INT_RXSTPI: - return (&AVR32_USBB.UESTA0)[USB_SelectedEndpoint].rxstpi; + return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].rxstpi; #endif #if defined(USB_CAN_BE_HOST) case USB_INT_HSOFI: |