change tusb_init(), tusb_rhport_init() to use init struct for expanda…

…bility
hathach · Oct 11, 2024 · 57c5c37 · 57c5c37
1 parent a4fb835
commit 57c5c37
Show file tree

Hide file tree

Showing 48 changed files with 350 additions and 80 deletions.
diff --git a/examples/device/audio_4_channel_mic/src/main.c b/examples/device/audio_4_channel_mic/src/main.c
@@ -86,7 +86,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/audio_4_channel_mic_freertos/src/main.c b/examples/device/audio_4_channel_mic_freertos/src/main.c
@@ -209,7 +209,12 @@ void usb_device_task(void* param)
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/audio_test/src/main.c b/examples/device/audio_test/src/main.c
@@ -79,7 +79,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/audio_test_freertos/src/main.c b/examples/device/audio_test_freertos/src/main.c
@@ -156,7 +156,12 @@ void usb_device_task(void* param)
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/audio_test_multi_rate/src/main.c b/examples/device/audio_test_multi_rate/src/main.c
@@ -97,7 +97,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/cdc_dual_ports/src/main.c b/examples/device/cdc_dual_ports/src/main.c
@@ -52,7 +52,12 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/cdc_msc/src/main.c b/examples/device/cdc_msc/src/main.c
@@ -51,7 +51,12 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/cdc_msc_freertos/src/main.c b/examples/device/cdc_msc_freertos/src/main.c
@@ -132,7 +132,12 @@ static void usb_device_task(void *param) {
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/cdc_uac2/src/main.c b/examples/device/cdc_uac2/src/main.c
@@ -46,7 +46,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
 #if (CFG_TUSB_MCU == OPT_MCU_RP2040)
   stdio_init_all();

diff --git a/examples/device/dfu/src/main.c b/examples/device/dfu/src/main.c
@@ -75,7 +75,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/dfu_runtime/src/main.c b/examples/device/dfu_runtime/src/main.c
@@ -70,7 +70,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/dynamic_configuration/src/main.c b/examples/device/dynamic_configuration/src/main.c
@@ -57,7 +57,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/hid_boot_interface/src/main.c b/examples/device/hid_boot_interface/src/main.c
@@ -57,7 +57,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/hid_composite/src/main.c b/examples/device/hid_composite/src/main.c
@@ -58,7 +58,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/hid_composite_freertos/src/main.c b/examples/device/hid_composite_freertos/src/main.c
@@ -136,7 +136,12 @@ void usb_device_task(void* param)
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/hid_generic_inout/src/main.c b/examples/device/hid_generic_inout/src/main.c
@@ -81,7 +81,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/hid_multiple_interface/src/main.c b/examples/device/hid_multiple_interface/src/main.c
@@ -62,7 +62,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/midi_test/src/main.c b/examples/device/midi_test/src/main.c
@@ -63,7 +63,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/msc_dual_lun/src/main.c b/examples/device/msc_dual_lun/src/main.c
@@ -54,7 +54,12 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/net_lwip_webserver/src/main.c b/examples/device/net_lwip_webserver/src/main.c
@@ -216,7 +216,12 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/uac2_headset/src/main.c b/examples/device/uac2_headset/src/main.c
@@ -100,7 +100,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/uac2_speaker_fb/src/main.c b/examples/device/uac2_speaker_fb/src/main.c
@@ -106,7 +106,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/usbtmc/src/main.c b/examples/device/usbtmc/src/main.c
@@ -55,7 +55,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/video_capture/src/main.c b/examples/device/video_capture/src/main.c
@@ -68,7 +68,12 @@ int main(void) {
   freertos_init_task();
 #else
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();
@@ -319,7 +324,12 @@ void usb_device_task(void *param) {
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise, it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/video_capture_2ch/src/main.c b/examples/device/video_capture_2ch/src/main.c
@@ -68,7 +68,12 @@ int main(void) {
   freertos_init_task();
 #else
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();
@@ -327,7 +332,12 @@ void usb_device_task(void *param) {
   // init device stack on configured roothub port
   // This should be called after scheduler/kernel is started.
   // Otherwise, it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/device/webusb_serial/src/main.c b/examples/device/webusb_serial/src/main.c
@@ -91,7 +91,12 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_init(BOARD_TUD_RHPORT, TUSB_ROLE_DEVICE);
+  tusb_rhport_init_t dev_init = {
+    .rhport = BOARD_TUD_RHPORT,
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUSB_SPEED_AUTO
+  };
+  tusb_init(&dev_init);
 
   if (board_init_after_tusb) {
     board_init_after_tusb();

diff --git a/examples/dual/host_hid_to_device_cdc/only.txt b/examples/dual/host_hid_to_device_cdc/only.txt
@@ -4,3 +4,4 @@ board:mcb1800
 mcu:RP2040
 mcu:ra6m5
 mcu:MAX3421
+mcu:STM32H7