noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in handling of long descriptors for bootloader USB (thank you, Todd Krein, Limor Fried, and Phillip Torrone) 

descriptors longer than 255 bytes were being shortened, causing problems with enumeration under Windows
This commit is contained in:
Zach Eveland 2012-01-10 14:25:40 -05:00
parent 989f672d34
commit 59ef51d752
2 changed files with 124 additions and 1023 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1139
bootloaders/diskloader/DiskLoader-Leonardo.hex
View File

File diff suppressed because it is too large Load Diff

8
bootloaders/diskloader/src/USBCore.cpp
View File

@ -351,7 +351,7 @@ u8 _cdcComposite = 0;
bool SendDescriptor()
{
Setup& setup = _setup;
u8 desc_length = 0;
u16 desc_length = 0;
const u8* desc_addr = 0;
u8 t = setup.wValueH;
@ -387,13 +387,13 @@ bool SendDescriptor()
if (desc_length == 0)
desc_length = pgm_read_byte(desc_addr);
if ((u8)setup.wLength < desc_length) // bit of a cheat limiting to 255 bytes TODO (saved 8 bytes)
desc_length = (u8)setup.wLength;
if (setup.wLength < desc_length)
desc_length = setup.wLength;
// Send descriptor
// EP0 is 64 bytes long
// RWAL and FIFOCON don't work on EP0
u8 n = 0;
u16 n = 0;
do
{
if (!WaitForINOrOUT())