ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed possible register corruption in USB Host mode on AVR8 devices when ORDERED_EP_CONFIG is used (thanks to Martin Aakerberg).

Browse source
This commit is contained in:
Dean Camera 2013-04-21 19:06:34 +00:00
parent 2fe1d7d170
commit 8232721102
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
LUFA/DoxygenPages/ChangeLog.txt
View file

@ -21,6 +21,7 @@
* <b>Fixed:</b>
* - Core:
* - Fixed Low Speed USB devices broken when using the library HID Class driver (thanks to Michael)
* - Fixed possible register corruption in USB Host mode on AVR8 devices when ORDERED_EP_CONFIG is used (thanks to Martin Aakerberg)
* - Library Applications:
* - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an
* unknown SCSI command

8
LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
View file

@ -47,13 +47,13 @@ bool Pipe_ConfigurePipeTable(const USB_Pipe_Table_t* const Table,
{
if (!(Table[i].Address))
continue;
if (!(Pipe_ConfigurePipe(Table[i].Address, Table[i].Type, Table[i].EndpointAddress, Table[i].Size, Table[i].Banks)))
{
return false;
}
}
return true;
}
@ -65,7 +65,7 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
{
uint8_t Number = (Address & PIPE_EPNUM_MASK);
uint8_t Token = (Address & PIPE_DIR_IN) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT;
if (Number >= PIPE_TOTAL_PIPES)
return false;
@ -97,7 +97,7 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
if (PNum == Number)
{
UPCFG0XTemp = ((Type << EPTYPE0) | Token | ((EndpointAddress & PIPE_EPNUM_MASK) << PEPNUM0));
UPCFG1XTemp = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));
UPCFG1XTemp = ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Pipe_BytesToEPSizeMask(Size));
UPCFG2XTemp = 0;
UPIENXTemp = 0;
}