forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix UC3B architecture compile errors and ensure the architecture can be compiled with no special makefile tokens defined.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 8b13f7f89a
commit e4b3e3fc65
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
LUFA/Common/Common.h
Unescape View File

@ -140,6 +140,8 @@
#define _delay_ms(x) #define _delay_ms(x)
#define memcmp_P(...) memcmp(__VA_ARGS__) #define memcmp_P(...) memcmp(__VA_ARGS__)
#define memcpy_P(...) memcpy(__VA_ARGS__) #define memcpy_P(...) memcpy(__VA_ARGS__)
#define USE_RAM_DESCRIPTORS
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */

4
LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.c
Unescape View File

@ -56,7 +56,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) | ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) | ((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) |
((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET)); ((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET));
USB_PipeFIFOPos[PNum] = &AVR32_USBB_SLAVE[PNum * 0x10000]; USB_PipeFIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000];
Pipe_SetInfiniteINRequests(); Pipe_SetInfiniteINRequests();
@ -70,7 +70,7 @@ void Pipe_ClearPipes(void)
Pipe_SelectPipe(PNum); Pipe_SelectPipe(PNum);
(&AVR32_USBB.upcfg0)[PNum] = 0; (&AVR32_USBB.upcfg0)[PNum] = 0;
(&AVR32_USBB.upcon0clr)[PNum] = 0xFFFFFFFF; (&AVR32_USBB.upcon0clr)[PNum] = 0xFFFFFFFF;
USB_PipeFIFOPos[PNum] = &AVR32_USBB_SLAVE[EPNum * 0x10000]; USB_PipeFIFOPos[PNum] = &AVR32_USBB_SLAVE[PNum * 0x10000];
Pipe_DisablePipe(); Pipe_DisablePipe();
} }
} }

10
LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
Unescape View File

@ -247,7 +247,7 @@
{ {
AVR32_USBB.uprst |= (AVR32_USBB_PRST0_MASK << PipeNumber); AVR32_USBB.uprst |= (AVR32_USBB_PRST0_MASK << PipeNumber);
AVR32_USBB.uprst &= ~(AVR32_USBB_PRST0_MASK << PipeNumber); AVR32_USBB.uprst &= ~(AVR32_USBB_PRST0_MASK << PipeNumber);
USB_PipeFIFOPos[Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[Pipe_SelectedPipe * 0x10000]; USB_PipeFIFOPos[USB_SelectedPipe] = &AVR32_USBB_SLAVE[USB_SelectedPipe * 0x10000];
} }
/** Enables the currently selected pipe so that data can be sent and received through it to and from /** Enables the currently selected pipe so that data can be sent and received through it to and from
@ -520,7 +520,7 @@
static inline void Pipe_ClearSETUP(void) static inline void Pipe_ClearSETUP(void)
{ {
(&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].txstpic = true; (&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].txstpic = true;
USB_PipeFIFOPos[Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[Pipe_SelectedPipe * 0x10000]; USB_PipeFIFOPos[USB_SelectedPipe] = &AVR32_USBB_SLAVE[USB_SelectedPipe * 0x10000];
} }
/** Acknowledges the reception of a setup IN request from the attached device on the currently selected /** Acknowledges the reception of a setup IN request from the attached device on the currently selected
@ -533,7 +533,7 @@
{ {
(&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].rxinic = true; (&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].rxinic = true;
(&AVR32_USBB.UPCON0CLR)[USB_SelectedPipe].fifoconc = true; (&AVR32_USBB.UPCON0CLR)[USB_SelectedPipe].fifoconc = true;
USB_PipeFIFOPos[Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[Pipe_SelectedPipe * 0x10000]; USB_PipeFIFOPos[USB_SelectedPipe] = &AVR32_USBB_SLAVE[USB_SelectedPipe * 0x10000];
} }
/** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing /** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing
@ -546,7 +546,7 @@
{ {
(&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].txoutic = true; (&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].txoutic = true;
(&AVR32_USBB.UPCON0CLR)[USB_SelectedPipe].fifoconc = true; (&AVR32_USBB.UPCON0CLR)[USB_SelectedPipe].fifoconc = true;
USB_PipeFIFOPos[Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[Pipe_SelectedPipe * 0x10000]; USB_PipeFIFOPos[USB_SelectedPipe] = &AVR32_USBB_SLAVE[USB_SelectedPipe * 0x10000];
} }
/** Determines if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on /** Determines if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on
@ -598,7 +598,7 @@
static inline void Pipe_ClearStall(void) static inline void Pipe_ClearStall(void)
{ {
(&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].rxstalldic = true; (&AVR32_USBB.UPSTA0CLR)[USB_SelectedPipe].rxstalldic = true;
USB_PipeFIFOPos[Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[Pipe_SelectedPipe * 0x10000]; USB_PipeFIFOPos[USB_SelectedPipe] = &AVR32_USBB_SLAVE[USB_SelectedPipe * 0x10000];
} }
/** Reads one byte from the currently selected pipe's bank, for OUT direction pipes. /** Reads one byte from the currently selected pipe's bank, for OUT direction pipes.

Write Preview
Loading…
Cancel
Save