mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-10-30 12:52:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix incorrect bank mask in Endpoint_ConfigureEndpoint() for the UC3 devices.

Browse Source
This commit is contained in:
Dean Camera 2012-06-02 19:34:10 +00:00
parent 85579e12e4
commit 0d888458e1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
View File

@ -65,7 +65,7 @@ bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
const uint32_t UECFG0Data) const uint32_t UECFG0Data)
{ {
USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
#if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG) #if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG)
Endpoint_SelectEndpoint(Number); Endpoint_SelectEndpoint(Number);

6
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
View File

@ -210,9 +210,9 @@
{ {
return Endpoint_ConfigureEndpoint_Prv((Address & ENDPOINT_EPNUM_MASK), return Endpoint_ConfigureEndpoint_Prv((Address & ENDPOINT_EPNUM_MASK),
(AVR32_USBB_ALLOC_MASK | (AVR32_USBB_ALLOC_MASK |
((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) | ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) |
((uint32_t)(Address & ENDPOINT_DIR_IN) ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) | ((Address & ENDPOINT_DIR_IN) ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) | ((Banks > 1) ? AVR32_USBB_UECFG0_EPBK_SINGLE : AVR32_USBB_UECFG0_EPBK_DOUBLE) |
Endpoint_BytesToEPSizeMask(Size))); Endpoint_BytesToEPSizeMask(Size)));
} }

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
View File

@ -72,7 +72,7 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
if (Type == EP_TYPE_CONTROL) if (Type == EP_TYPE_CONTROL)
Token = PIPE_TOKEN_SETUP; Token = PIPE_TOKEN_SETUP;
USB_Pipe_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000]; USB_Pipe_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * PIPE_HSB_ADDRESS_SPACE_SIZE];
#if defined(ORDERED_EP_CONFIG) #if defined(ORDERED_EP_CONFIG)
Pipe_SelectPipe(Number); Pipe_SelectPipe(Number);