change tusb_init(), tusb_rhport_init() to use init struct for expandability

26 files changed, 168 insertions, 28 deletions

diff --git a/examples/device/audio_4_channel_mic/src/main.c b/examples/device/audio_4_channel_mic/src/main.c
index 6c75d95bf..ca0e67fae 100644
--- 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
index d24113df6..c1ebc4899 100644
--- 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
index 9702060e0..f4c1bf95f 100644
--- 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
index 3d9166263..b7d7dc042 100644
--- 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
index 99b81f74d..a1c4d32db 100644
--- 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
index 07f41371a..b446bca0b 100644
--- 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
index a1f178e2a..47ba5a887 100644
--- 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
index b84b33a8c..a08e063ac 100644
--- 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
index a75ec1427..384d910ec 100644
--- 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
index 5efec9d32..f2aea7cfc 100644
--- 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
index c21034fc1..5d6b907b7 100644
--- 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
index bc9ab0b2b..143570c5c 100644
--- 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
index 351a60854..dfee7421d 100644
--- 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
index 8f7873ee3..56c485982 100644
--- 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
index d1842368b..fc07a1a39 100644
--- 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
index 03de8bfee..1bbcbf7a4 100644
--- 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
index 0b7544fe0..edcedd3ca 100644
--- 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
index 84ca1d944..b05307d1b 100644
--- 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
index 9b0930ce0..fe3896ca7 100644
--- 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
index dbd7746b0..6041b56e2 100644
--- 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
index 73616109f..4d28f73a4 100644
--- 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
index 21c2ac24a..1250b041d 100644
--- 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
index 8dbded632..2af581bc1 100644
--- 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
index 4b8877a2f..c5d87c660 100644
--- 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
index 118ee669d..a45e62ab0 100644
--- 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
index e809c6319..46215ec13 100644
--- 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();