Merge remote-tracking branch 'upstream-framework/fwupd' into framework

Dialgatrainer02 · Dec 9, 2024 · a839a5a · a839a5a
2 parents ab7b7e0 + 5b72932
commit a839a5a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
@@ -43,6 +43,7 @@
 #include "usb_device_state.h"
 #include "usb_descriptor.h"
 #include "usb_driver.h"
+#include "platforms/bootloader.h"
 
 #ifdef NKRO_ENABLE
 #    include "keycode_config.h"
@@ -651,6 +652,21 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
      *  4,5: (LSB,MSB) wIndex
      *  6,7: (LSB,MSB) wLength (number of bytes to transfer if there is a data phase) */
 
+    if (((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) && ((usbp->setup[0] & USB_RTYPE_RECIPIENT_MASK) == USB_RTYPE_RECIPIENT_INTERFACE)) {
+        dprint("  TYPE_CLASS, RECIPIENT_INTERFACE\n");
+        if ((usbp->setup[0] & USB_RTYPE_DIR_MASK) == USB_RTYPE_DIR_HOST2DEV) {
+            if (usbp->setup[4] == RP2040_RESET_INTERFACE) {
+                switch (usbp->setup[1]) { /* bRequest */
+                    case 0x01: // RESET_REQUEST_BOOTSEL
+                    case 0x02: // RESET_REQUEST_FLASH
+                        dprint("  Reset interface\n");
+                        bootloader_jump();
+                    break;
+                }
+            }
+        }
+    }
+
     /* Handle HID class specific requests */
     if (((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) && ((usbp->setup[0] & USB_RTYPE_RECIPIENT_MASK) == USB_RTYPE_RECIPIENT_INTERFACE)) {
         switch (usbp->setup[0] & USB_RTYPE_DIR_MASK) {

diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
@@ -738,6 +738,19 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
         .PollingIntervalMS      = USB_POLLING_INTERVAL_MS
     },
 #endif
+    .Rp2040_Reset_Interface = {
+        .Header = {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
+            .Type               = DTYPE_Interface
+        },
+        .InterfaceNumber        = RP2040_RESET_INTERFACE,
+        .AlternateSetting       = 0x00,
+        .TotalEndpoints         = 2,
+        .Class                  = 0xFF,
+        .SubClass               = 0x00, // RESET_INTERFACE_SUBCLASS
+        .Protocol               = 0x01, // RESET_INTERFACE_PROTOCOL
+        .InterfaceStrIndex      = NO_DESCRIPTOR
+    },
 
 #ifdef CONSOLE_ENABLE
     /*

diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
@@ -92,6 +92,8 @@ typedef struct {
     USB_Descriptor_Endpoint_t  Shared_INEndpoint;
 #endif
 
+    USB_Descriptor_Interface_t Rp2040_Reset_Interface;
+
 #ifdef CONSOLE_ENABLE
     // Console HID Interface
     USB_Descriptor_Interface_t Console_Interface;
@@ -173,6 +175,8 @@ enum usb_interfaces {
     SHARED_INTERFACE,
 #endif
 
+    RP2040_RESET_INTERFACE,
+
 #ifdef CONSOLE_ENABLE
     CONSOLE_INTERFACE,
 #endif