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/Pipe_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/Pipe_UC3.c')
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c index 5c9a44f03..eca6cb8aa 100644 --- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c @@ -47,6 +47,8 @@ bool Pipe_ConfigurePipe(const uint8_t Number, const uint16_t Size, const uint8_t Banks) { + USB_Pipe_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; + #if defined(ORDERED_EP_CONFIG) Pipe_SelectPipe(Number); Pipe_EnablePipe(); @@ -57,7 +59,6 @@ bool Pipe_ConfigurePipe(const uint8_t Number, ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) | ((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) | ((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET)); - USB_PipeFIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; Pipe_SetInfiniteINRequests(); @@ -65,7 +66,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, #else for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++) { - uint8_t UPCFG0Temp; + uint32_t UPCFG0Temp; Pipe_SelectPipe(PNum); @@ -109,7 +110,7 @@ void Pipe_ClearPipes(void) Pipe_SelectPipe(PNum); (&AVR32_USBB.upcfg0)[PNum] = 0; (&AVR32_USBB.upcon0clr)[PNum] = -1; - USB_PipeFIFOPos[PNum] = &AVR32_USBB_SLAVE[PNum * 0x10000]; + USB_Pipe_FIFOPos[PNum] = &AVR32_USBB_SLAVE[PNum * 0x10000]; Pipe_DisablePipe(); } } |