serial: remove starting/stopping tusb task externally/explicitly

Does not appear to be required any more. The internally-managed task appears to use the same stack, core affinity, priority etc. as the one we were managing externally, and seems to work well.
Blockstream · Jan 28, 2025 · 24ead26 · 24ead26
1 parent 35cd4dc
commit 24ead26
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 54 deletions.
diff --git a/configs/sdkconfig_display_m5cores3.defaults b/configs/sdkconfig_display_m5cores3.defaults
@@ -80,5 +80,4 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
 CONFIG_WIFI_PROV_BLE_SEC_CONN=n
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3.defaults b/configs/sdkconfig_display_ttgo_tdisplays3.defaults
@@ -82,4 +82,3 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults
@@ -86,4 +86,3 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3_gcov_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3_gcov_ci.defaults
@@ -72,4 +72,3 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults b/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults
@@ -80,4 +80,3 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_display_ttgo_twatchs3.defaults b/configs/sdkconfig_display_ttgo_twatchs3.defaults
@@ -86,5 +86,4 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=n
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
 CONFIG_WIFI_PROV_BLE_SEC_CONN=n
diff --git a/configs/sdkconfig_jade_v2s3.defaults b/configs/sdkconfig_jade_v2s3.defaults
@@ -82,4 +82,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_jade_v2s3_ci.defaults b/configs/sdkconfig_jade_v2s3_ci.defaults
@@ -87,4 +87,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_jade_v2s3_ndebug.defaults b/configs/sdkconfig_jade_v2s3_ndebug.defaults
@@ -81,4 +81,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio.defaults b/configs/sdkconfig_jade_v2s3_noradio.defaults
@@ -70,4 +70,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio_ci.defaults b/configs/sdkconfig_jade_v2s3_noradio_ci.defaults
@@ -75,4 +75,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults b/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults
@@ -69,4 +69,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
diff --git a/main/serial.c b/main/serial.c
@@ -60,39 +60,6 @@ static SemaphoreHandle_t writer_shutdown_done = NULL;
 #endif
 #endif // IDF_TARGET_ESP32
 
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#ifndef CONFIG_JADE_USE_USB_JTAG_SERIAL
-static TaskHandle_t s_tusb_tskh;
-
-static void tusb_device_task(void* arg)
-{
-    while (true) {
-        tud_task();
-        vTaskDelay(10 / portTICK_PERIOD_MS);
-    }
-}
-
-esp_err_t tusb_run_task(void)
-{
-    assert(!s_tusb_tskh);
-    void* task_arg = NULL;
-    xTaskCreatePinnedToCore(tusb_device_task, "TinyUSB", 1024 * 4, task_arg, 5, &s_tusb_tskh, 1);
-    if (!s_tusb_tskh) {
-        return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-esp_err_t tusb_stop_task(void)
-{
-    assert(s_tusb_tskh);
-    vTaskDelete(s_tusb_tskh);
-    s_tusb_tskh = NULL;
-    return ESP_OK;
-}
-#endif
-#endif // IDF_TARGET_ESP32S3
-
 static void post_exit_event_and_await_death(SemaphoreHandle_t* semaphore_done)
 {
     // Post 'exit' event
@@ -244,10 +211,6 @@ static bool serial_init_internal(void)
     if (err != ESP_OK) {
         return false;
     }
-    err = tusb_run_task();
-    if (err != ESP_OK) {
-        return false;
-    }
     const tinyusb_config_cdcacm_t acm_cfg = { .usb_dev = TINYUSB_USBDEV_0,
         .cdc_port = TINYUSB_CDC_ACM_0,
         .rx_unread_buf_sz = 64,
@@ -356,8 +319,6 @@ void serial_stop(void)
 #ifndef CONFIG_JADE_USE_USB_JTAG_SERIAL
     esp_err_t err = tusb_cdc_acm_deinit(TINYUSB_CDC_ACM_0);
     JADE_ASSERT(err == ESP_OK);
-    err = tusb_stop_task();
-    JADE_ASSERT(err == ESP_OK);
     err = tinyusb_driver_uninstall();
     JADE_ASSERT(err == ESP_OK);
 #endif

diff --git a/production/sdkconfig_jade_v2s3_noradio_prod.defaults b/production/sdkconfig_jade_v2s3_noradio_prod.defaults
@@ -79,5 +79,4 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
 CONFIG_USJ_ENABLE_USB_SERIAL_JTAG=n
diff --git a/production/sdkconfig_jade_v2s3_prod.defaults b/production/sdkconfig_jade_v2s3_prod.defaults
@@ -92,5 +92,4 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y
 CONFIG_USJ_ENABLE_USB_SERIAL_JTAG=n
diff --git a/production/sdkconfig_jade_v2s3_smoketest.defaults b/production/sdkconfig_jade_v2s3_smoketest.defaults
@@ -85,4 +85,3 @@ CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=64
 CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Blockstream"
 CONFIG_TINYUSB_DESC_PRODUCT_STRING="Jade Plus"
-CONFIG_TINYUSB_NO_DEFAULT_TASK=y