change the tusb_rhport_init_t struct, exclude the rhport to make API more consistent

3 files changed, 11 insertions, 17 deletions

diff --git a/test/fuzz/dcd_fuzz.cc b/test/fuzz/dcd_fuzz.cc
index 7ef0c7446..e76ae5087 100644
--- a/test/fuzz/dcd_fuzz.cc
+++ b/test/fuzz/dcd_fuzz.cc
@@ -46,7 +46,8 @@ tu_static State state = {false, 0, 0};
 // All no-ops as we are fuzzing.
 //--------------------------------------------------------------------+
 extern "C" {
-void dcd_init(const tusb_rhport_init_t* rh_init) {
+void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
+  UNUSED(rhport);
   UNUSED(rh_init);
   return;
 }
diff --git a/test/unit-test/test/device/msc/test_msc_device.c b/test/unit-test/test/device/msc/test_msc_device.c
index 4033bf158..60fcdb41c 100644
--- a/test/unit-test/test/device/msc/test_msc_device.c
+++ b/test/unit-test/test/device/msc/test_msc_device.c
@@ -199,13 +199,12 @@ void setUp(void)
 
   if ( !tud_inited() ) {
     tusb_rhport_init_t dev_init = {
-      .rhport = 0,
       .role = TUSB_ROLE_DEVICE,
       .speed = TUSB_SPEED_AUTO
     };
 
-    dcd_init_Expect(&dev_init);
-    tusb_init(&dev_init);
+    dcd_init_Expect(0, &dev_init);
+    tusb_init(0, &dev_init);
   }
 
   dcd_event_bus_reset(rhport, TUSB_SPEED_HIGH, false);
diff --git a/test/unit-test/test/device/usbd/test_usbd.c b/test/unit-test/test/device/usbd/test_usbd.c
index 8f900f656..598dac641 100644
--- a/test/unit-test/test/device/usbd/test_usbd.c
+++ b/test/unit-test/test/device/usbd/test_usbd.c
@@ -102,44 +102,38 @@ uint8_t const* desc_configuration;
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
-uint8_t const * tud_descriptor_device_cb(void)
-{
+uint8_t const * tud_descriptor_device_cb(void) {
   return desc_device;
 }
 
-uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
-{
+uint8_t const * tud_descriptor_configuration_cb(uint8_t index) {
   return desc_configuration;
 }
 
-uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid)
-{
+uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
   (void) langid;
 
   return NULL;
 }
 
-void setUp(void)
-{
+void setUp(void) {
   dcd_int_disable_Ignore();
   dcd_int_enable_Ignore();
 
   if ( !tud_inited() ) {
     tusb_rhport_init_t dev_init = {
-      .rhport = 0,
       .role = TUSB_ROLE_DEVICE,
       .speed = TUSB_SPEED_AUTO
     };
 
     mscd_init_Expect();
-    dcd_init_Expect(&dev_init);
+    dcd_init_Expect(0, &dev_init);
 
-    tusb_init(&dev_init);
+    tusb_init(0, &dev_init);
   }
 }
 
-void tearDown(void)
-{
+void tearDown(void) {
 }
 
 //--------------------------------------------------------------------+