di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Fixing Mac OSX freeze on wake-up bug

Browse Source 
- CLEAR_FEATURE unset is currently causing the keyboarod to freeze
- Though not ideal, it seems harmless to ignore this USB Control Packet
- Tested working on a Mac Mini (Yosemite)
This commit is contained in:
Jacob Alexander 2015-03-07 00:34:14 -08:00
parent 733201d39b
commit b2dfd63d4b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Output/pjrcUSB/arm/usb_dev.c
View File

@ -317,13 +317,17 @@ static void usb_setup()
i = setup.wIndex & 0x7F; i = setup.wIndex & 0x7F;
if ( i > NUM_ENDPOINTS || setup.wValue != 0 ) if ( i > NUM_ENDPOINTS || setup.wValue != 0 )
{ {
// TODO: do we need to handle IN vs OUT here?
endpoint0_stall(); endpoint0_stall();
return; return;
} }
(*(uint8_t *)(&USB0_ENDPT0 + setup.wIndex * 4)) &= ~0x02; //(*(uint8_t *)(&USB0_ENDPT0 + setup.wIndex * 4)) &= ~0x02;
// TODO: do we need to clear the data toggle here? // TODO: do we need to clear the data toggle here?
break; //break;
// FIXME: Clearing causes keyboard to freeze, likely an invalid clear
// XXX: Ignoring seems to work, though this may not be the ideal behaviour -HaaTa
endpoint0_stall();
return;
case 0x0302: // SET_FEATURE (endpoint) case 0x0302: // SET_FEATURE (endpoint)
i = setup.wIndex & 0x7F; i = setup.wIndex & 0x7F;
if ( i > NUM_ENDPOINTS || setup.wValue != 0 ) if ( i > NUM_ENDPOINTS || setup.wValue != 0 )