Mercurial > louis > kiibohd-controller
changeset 381:fbe55b27dc02
Cleaning up CLEAR_FEATURE (endpoint)
- Reverting old fix that no longer seems relevant after numerous recent USB fixes
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Tue, 06 Oct 2015 00:24:04 -0700 |
| parents | 5f085e29a66c |
| children | 2268093deff4 |
| files | Output/pjrcUSB/arm/usb_dev.c |
| diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Output/pjrcUSB/arm/usb_dev.c Sun Oct 04 16:19:20 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_dev.c Tue Oct 06 00:24:04 2015 -0700 @@ -330,27 +330,21 @@ endpoint0_stall(); return; - case 0x0102: // CLEAR_FEATURE (interface) + case 0x0102: // CLEAR_FEATURE (endpoint) i = setup.wIndex & 0x7F; if ( i > NUM_ENDPOINTS || setup.wValue != 0 ) { endpoint0_stall(); return; } - warn_print("CLEAR_FEATURE - Interface"); - //(*(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? - //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; + goto send; case 0x0300: // SET_FEATURE (device) case 0x0301: // SET_FEATURE (interface) // TODO: Currently ignoring, perhaps useful? -HaaTa - warn_print("SET_FEATURE"); + warn_print("SET_FEATURE - Device/Interface"); endpoint0_stall(); return;