~ruther/qmk_firmware: Always read two bytes from the endpoint if we have two bytes to read

ae79b60e6bfc03c7fa84076e508f0f2241f087c2 — fauxpark 6 years ago 8cf7265

Always read two bytes from the endpoint if we have two bytes to read

When this if statement is false, it will cause the report ID to be read as the LED state.
We already know there are two bytes in the endpoint, which is a reasonably good indicator that it contains a report ID, so we should always read both.

patch browse .tar.gz

1 files changed, 1 insertions(+), 5 deletions(-)

M tmk_core/protocol/lufa/lufa.c

M tmk_core/protocol/lufa/lufa.c => tmk_core/protocol/lufa/lufa.c +1 -5

@@ 519,11 519,7 @@ void EVENT_USB_Device_ControlRequest(void)
                     }
 
                     if (Endpoint_BytesInEndpoint() == 2) {
-                      uint8_t report_id = REPORT_ID_KEYBOARD;
-
-                      if (keyboard_protocol) {
-                        report_id = Endpoint_Read_8();
-                      }
+                      uint8_t report_id = Endpoint_Read_8();
 
                       if (report_id == REPORT_ID_KEYBOARD || report_id == REPORT_ID_NKRO) {
                         keyboard_led_stats = Endpoint_Read_8();