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/Endpoint_UC3.c | |
| 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/Endpoint_UC3.c')
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c index 7cd7ccf25..c8e3af72a 100644 --- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c @@ -45,19 +45,20 @@ volatile uint8_t* USB_Endpoint_FIFOPos[ENDPOINT_TOTAL_ENDPOINTS]; bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, const uint32_t UECFG0Data) { + USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; + #if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG) Endpoint_SelectEndpoint(Number); Endpoint_EnableEndpoint(); (&AVR32_USBB.uecfg0)[Number] = 0; (&AVR32_USBB.uecfg0)[Number] = UECFG0Data; - USB_EndpointFIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; return Endpoint_IsConfigured(); #else for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++) { - uint8_t UECFG0Temp; + uint32_t UECFG0Temp; Endpoint_SelectEndpoint(EPNum); @@ -95,7 +96,7 @@ void Endpoint_ClearEndpoints(void) Endpoint_SelectEndpoint(EPNum); (&AVR32_USBB.uecfg0)[EPNum] = 0; (&AVR32_USBB.uecon0clr)[EPNum] = -1; - USB_EndpointFIFOPos[EPNum] = &AVR32_USBB_SLAVE[EPNum * 0x10000]; + USB_Endpoint_FIFOPos[EPNum] = &AVR32_USBB_SLAVE[EPNum * 0x10000]; Endpoint_DisableEndpoint(); } } |