call tuh_hid_receive_abort() when detach from kernel driver

hathach · hathach · commit 3d8840233127 · 2024-03-04T18:16:32.000+07:00
- add tuh_event_hook_cb() in SRAM, required when updated to latest tinyusb
- bump up pico-pio-usb to latest
- bump up tinyusb to latest for new tuh_hid_receive_abort(), and all endpoint abort when
SET_CONFIGURATION
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 1eb6ce784ca9b8acbbe43dba9f1d9c26c2e80eb0
+Subproject commit a0e5626bc50d484a23f33000c48082179f0cc2dd
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
@@ -1 +1 @@
-Subproject commit d00a10a8c425d0d40f81b87169102944b01f3bb3
+Subproject commit 0f747aaa0c16f750bdfa2ba37ec25d6c8e1bc117
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,7 @@ void usb_keyboard_detach(uint8_t dev_addr, uint8_t interface) {`
`329`	`329`	`if (!usb_keyboard_in_use(dev_addr, interface)) {`
`330`	`330`	`return;`
`331`	`331`	`}`
	`332`	`+ tuh_hid_receive_abort(dev_addr, interface);`
`332`	`333`	`_dev_addr = 0;`
`333`	`334`	`_interface = 0;`
`334`	`335`	`}`