Don't duplicate USB callbacks.

Author: tannewt

lib/tinyusb

@@ -54,31 +54,6 @@ static void usb_device_task(void *param) {
         vTaskDelay(1);
     }
 }
-
-/**
- * Callback invoked when received an "wanted" char.
- * @param itf           Interface index (for multiple cdc interfaces)
- * @param wanted_char   The wanted char (set previously)
- */
-void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
-    (void)itf;  // not used
-    // CircuitPython's VM is run in a separate FreeRTOS task from TinyUSB.
-    // So, we must notify the other task when a CTRL-C is received.
-    port_wake_main_task();
-    // Workaround for using shared/runtime/interrupt_char.c
-    // Compare mp_interrupt_char with wanted_char and ignore if not matched
-    if (mp_interrupt_char == wanted_char) {
-        tud_cdc_read_flush();    // flush read fifo
-        mp_sched_keyboard_interrupt();
-    }
-}
-
-void tud_cdc_rx_cb(uint8_t itf) {
-    (void)itf;
-    // Workaround for "press any key to enter REPL" response being delayed on espressif.
-    // Wake main task when any key is pressed.
-    port_wake_main_task();
-}
 #endif // CIRCUITPY_USB_DEVICE
 
 void init_usb_hardware(void) {

ports/espressif/supervisor/usb.c

@@ -24,7 +24,7 @@
         addresses = addresses[len("Backtrace:") :]
         addresses = addresses.strip().split()
         addresses = [address.split(":")[0] for address in addresses]
-    if addresses.startswith("Stack memory:"):
+    elif addresses.startswith("Stack memory:"):
         addresses = []
         extra_lines = sys.stdin.readlines()
         for line in extra_lines:

ports/espressif/tools/decode_backtrace.py

@@ -166,6 +166,9 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
  * @param wanted_char   The wanted char (set previously)
  */
 void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
+    // CircuitPython's VM is run in a separate FreeRTOS task from TinyUSB on ESP.
+    // So, we must notify the other task when a CTRL-C is received.
+    port_wake_main_task();
     // Workaround for using shared/runtime/interrupt_char.c
     // Compare mp_interrupt_char with wanted_char and ignore if not matched
     if (mp_interrupt_char == wanted_char) {
@@ -177,7 +180,14 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 void tud_cdc_send_break_cb(uint8_t itf, uint16_t duration_ms) {
     if (usb_cdc_console_enabled() && mp_interrupt_char != -1 && itf == 0 && duration_ms > 0) {
         mp_sched_keyboard_interrupt();
+        port_wake_main_task();
     }
 }
 
+void tud_cdc_rx_cb(uint8_t itf) {
+    (void)itf;
+    // Workaround for "press any key to enter REPL" response being delayed on espressif.
+    // Wake main task when any key is pressed.
+    port_wake_main_task();
+}
 #endif