Fixing long-standing SET_REPORT bug

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_dev.c

diff --git a/Output/pjrcUSB/arm/usb_dev.c b/Output/pjrcUSB/arm/usb_dev.c
index 9af914d586391ce4bec3f46e337d72a798920ea8..e913006e615d06970ed8e5408f0ced007a2b7af9 100644 (file)
--- a/Output/pjrcUSB/arm/usb_dev.c
+++ b/Output/pjrcUSB/arm/usb_dev.c
@@ -34,6 +34,7 @@
 // Project Includes
 #include <Lib/OutputLib.h>
 #include <print.h>
+#include <kll_defs.h>
 
 // Local Includes
 #include "usb_dev.h"
@@ -329,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;
 
@@ -429,17 +424,23 @@ static void usb_setup()
                return;
 
        case 0x0921: // HID SET_REPORT
-               #ifdef UART_DEBUG
-               warn_msg("SET_REPORT - ");
-               printHex( setup.wValue );
-               print(" - ");
-               printHex( setup.wValue & 0xFF );
-               print( NL );
-               #endif
-               USBKeys_LEDs = setup.wValue & 0xFF;
+               // Interface
+               switch ( setup.wIndex & 0xFF )
+               {
+               // Keyboard Interface
+               case KEYBOARD_INTERFACE:
+                       break;
+               // NKRO Keyboard Interface
+               case NKRO_KEYBOARD_INTERFACE:
+                       break;
+               default:
+                       warn_msg("Unknown interface - ");
+                       printHex( setup.wIndex );
+                       print( NL );
+                       endpoint0_stall();
+                       break;
+               }
 
-               // Must be stall for some reason... -HaaTa
-               endpoint0_stall();
                return;
 
        case 0x01A1: // HID GET_REPORT
@@ -617,6 +618,10 @@ static void usb_control( uint32_t stat )
                printHex(setup.wIndex);
                print(", len:");
                printHex(setup.wLength);
+               print(" -- ");
+               printHex32(setup.word1);
+               print(" ");
+               printHex32(setup.word2);
                print(NL);
                #endif
                // actually "do" the setup request
@@ -627,9 +632,22 @@ static void usb_control( uint32_t stat )
 
        case 0x01:  // OUT transaction received from host
        case 0x02:
-               #ifdef UART_DEBUG
-               print("PID=OUT"NL);
+               #ifdef UART_DEBUG_UNKNOWN
+               print("PID=OUT wRequestAndType:");
+               printHex(setup.wRequestAndType);
+               print(", wValue:");
+               printHex(setup.wValue);
+               print(", wIndex:");
+               printHex(setup.wIndex);
+               print(", len:");
+               printHex(setup.wLength);
+               print(" -- ");
+               printHex32(setup.word1);
+               print(" ");
+               printHex32(setup.word2);
+               print(NL);
                #endif
+
                // CDC Interface
                if ( setup.wRequestAndType == 0x2021 /*CDC_SET_LINE_CODING*/ )
                {
@@ -648,17 +666,38 @@ static void usb_control( uint32_t stat )
                        endpoint0_transmit( NULL, 0 );
                }
 
-               // Keyboard Interface
-               if ( setup.word1 == 0x02000921 && setup.word2 == ( (1<<16) | KEYBOARD_INTERFACE ) )
-               {
-                       USBKeys_LEDs = buf[0];
-                       endpoint0_transmit( NULL, 0 );
-               }
-               // NKRO Keyboard Interface
-               if ( setup.word1 == 0x02000921 && setup.word2 == ( (1<<16) | NKRO_KEYBOARD_INTERFACE ) )
+               // Keyboard SET_REPORT
+               if ( setup.wRequestAndType == 0x921 && setup.wValue & 0x200 )
                {
-                       USBKeys_LEDs = buf[0];
-                       endpoint0_transmit( NULL, 0 );
+                       // Interface
+                       switch ( setup.wIndex & 0xFF )
+                       {
+                       // Keyboard Interface
+                       case KEYBOARD_INTERFACE:
+                               USBKeys_LEDs = buf[0];
+                               endpoint0_transmit( NULL, 0 );
+                               break;
+                       // NKRO Keyboard Interface
+                       case NKRO_KEYBOARD_INTERFACE:
+                               // Only use 2nd byte, first byte is the report id
+                               USBKeys_LEDs = buf[1];
+                               endpoint0_transmit( NULL, 0 );
+                               break;
+                       default:
+                               warn_msg("Unknown interface - ");
+                               printHex( setup.wIndex );
+                               print( NL );
+                               break;
+                       }
+
+                       #ifdef UART_DEBUG
+                       for ( size_t len = 0; len < setup.wLength; len++ )
+                       {
+                               printHex( buf[ len ] );
+                               print(" ");
+                       }
+                       print( NL );
+                       #endif
                }
 
                // give the buffer back
@@ -872,6 +911,14 @@ void usb_tx( uint32_t endpoint, usb_packet_t *packet )
 
 void usb_device_reload()
 {
+       if ( flashModeEnabled_define == 0 )
+       {
+               print( NL );
+               warn_print("flashModeEnabled not set, cancelling firmware reload...");
+               info_msg("Set flashModeEnabled to 1 in your kll configuration.");
+               return;
+       }
+
 // MCHCK
 #if defined(_mk20dx128vlf5_)
 
@@ -882,7 +929,7 @@ void usb_device_reload()
        PORTA_PCR3 = PORT_PCR_PFE | PORT_PCR_MUX(1); // Internal pull-up
 
        // Check for jumper
-       if ( GPIOA_PDIR & (1<<3) )
+       if ( GPIOA_PDIR & (1<<3) && flashModeEnabled_define != 0 )
        {
                print( NL );
                warn_print("Security jumper not present, cancelling firmware reload...");
@@ -1022,8 +1069,8 @@ restart:
                                                break;
                                        default:
                                                tx_state[ endpoint ] = ((uint32_t)b & 8)
-                                                 ? TX_STATE_ODD_FREE
-                                                 : TX_STATE_EVEN_FREE;
+                                                       ? TX_STATE_ODD_FREE
+                                                       : TX_STATE_EVEN_FREE;
                                                break;
                                        }
                                }