From c90bafd5c4bf6730cba48569b566e6d3ee79b41b Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Tue, 6 Oct 2015 00:24:04 -0700 Subject: [PATCH] Cleaning up CLEAR_FEATURE (endpoint) - Reverting old fix that no longer seems relevant after numerous recent USB fixes --- Output/pjrcUSB/arm/usb_dev.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Output/pjrcUSB/arm/usb_dev.c b/Output/pjrcUSB/arm/usb_dev.c index 1cc4f13..125500a 100644 --- a/Output/pjrcUSB/arm/usb_dev.c +++ b/Output/pjrcUSB/arm/usb_dev.c @@ -330,27 +330,21 @@ static void usb_setup() 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;