shared/tinyusb: Use TinyUSB wanted_char for interrupt char handling.

Signed-off-by: Andrew Leech <andrew@alelec.net>
andrewleech · Oct 27, 2024 · 1bc3485 · 1bc3485
1 parent f535f30
commit 1bc3485
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/shared/runtime/interrupt_char.c b/shared/runtime/interrupt_char.c
@@ -27,12 +27,20 @@
 #include "py/obj.h"
 #include "py/mpstate.h"
 
+#if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV
+#include "shared/tinyusb/mp_usbd_cdc.h"
+#endif
+
 #if MICROPY_KBD_EXCEPTION
 
 int mp_interrupt_char = -1;
 
 void mp_hal_set_interrupt_char(int c) {
     mp_interrupt_char = c;
+
+    #if MICROPY_HW_USB_CDC && MICROPY_HW_ENABLE_USBDEV
+    machine_usbd_cdc_set_interrupt_char(c);
+    #endif
 }
 
 #endif
diff --git a/shared/tinyusb/mp_usbd_cdc.c b/shared/tinyusb/mp_usbd_cdc.c
@@ -281,19 +281,24 @@ static void machine_usbd_cdc_print(const mp_print_t *print, mp_obj_t self_in, mp
     mp_printf(print, "USBD_CDC()");
 }
 
+void machine_usbd_cdc_set_interrupt_char(int c) {
+    tud_cdc_set_wanted_char(c);
+}
+
+
 static void machine_usbd_cdc_attach_to_repl(const machine_usbd_cdc_obj_t *self, bool attached) {
     UNUSED(self);
     // self->attached_to_repl = attached;
     if (attached) {
         // Default behavior is non-blocking when attached to repl
         // self->flow &= ~USBD_CDC_FLOWCONTROL_CTS;
         #if MICROPY_KBD_EXCEPTION
-        tud_cdc_set_wanted_char(mp_interrupt_char);
+        machine_usbd_cdc_set_interrupt_char(mp_interrupt_char);
         #endif
     } else {
         // self->flow |= USBD_CDC_FLOWCONTROL_CTS;
         #if MICROPY_KBD_EXCEPTION
-        tud_cdc_set_wanted_char(-1);
+        machine_usbd_cdc_set_interrupt_char(-1);
         #endif
     }
 }

diff --git a/shared/tinyusb/mp_usbd_cdc.h b/shared/tinyusb/mp_usbd_cdc.h
@@ -40,7 +40,7 @@
 void machine_usbd_cdc_init0(void);
 // extern const mp_obj_type_t pyb_usb_vcp_type;
 extern const mp_obj_type_t machine_usbd_cdc_type;
-// extern void machine_usbd_cdc_attach_to_repl(const machine_usbd_cdc_obj_t *self, bool attached);
+void machine_usbd_cdc_set_interrupt_char(int c);
 
 
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);