Merge pull request adafruit#8999 from hathach/fix-8885

call tuh_hid_receive_abort() when detach from kernel driver
ladyada · Mar 4, 2024 · 0186d9c · 0186d9c
2 parents c3f9adb + 3d88402
commit 0186d9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/lib/tinyusb b/lib/tinyusb
diff --git a/ports/raspberrypi/common-hal/usb_host/Port.c b/ports/raspberrypi/common-hal/usb_host/Port.c
@@ -170,3 +170,10 @@ usb_host_port_obj_t *common_hal_usb_host_port_construct(const mcu_pin_obj_t *dp,
 
     return self;
 }
+
+// Not used, but we must define to put this hook into SRAM
+void __not_in_flash_func(tuh_event_hook_cb)(uint8_t rhport, uint32_t eventid, bool in_isr) {
+    (void)rhport;
+    (void)eventid;
+    (void)in_isr;
+}
diff --git a/ports/raspberrypi/lib/Pico-PIO-USB b/ports/raspberrypi/lib/Pico-PIO-USB
diff --git a/supervisor/shared/usb/host_keyboard.c b/supervisor/shared/usb/host_keyboard.c
@@ -329,6 +329,7 @@ void usb_keyboard_detach(uint8_t dev_addr, uint8_t interface) {
     if (!usb_keyboard_in_use(dev_addr, interface)) {
         return;
     }
+    tuh_hid_receive_abort(dev_addr, interface);
     _dev_addr = 0;
     _interface = 0;
 }
+1 −1		README.md
+1 −1		library.properties
+30 −16		src/pio_usb.c
+1 −1		src/pio_usb.h
+12 −8		src/pio_usb_configuration.h
+27 −17		src/pio_usb_host.c
+6 −2		src/pio_usb_ll.h
+10 −6		src/usb_rx.pio
+10 −6		src/usb_rx.pio.h
+102 −40		src/usb_tx.pio
+110 −52		src/usb_tx.pio.h