change dcd_init() to take rhport struct

2 files changed, 8 insertions, 9 deletions

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 3444d81c5..4033bf158 100644
--- a/test/unit-test/test/device/msc/test_msc_device.c
+++ b/test/unit-test/test/device/msc/test_msc_device.c
@@ -197,15 +197,14 @@ void setUp(void)
   dcd_int_disable_Ignore();
   dcd_int_enable_Ignore();
 
-  if ( !tud_inited() )
-  {
-    dcd_init_Expect(rhport);
-
+  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);
   }
 
diff --git a/test/unit-test/test/device/usbd/test_usbd.c b/test/unit-test/test/device/usbd/test_usbd.c
index faa6b159e..8f900f656 100644
--- a/test/unit-test/test/device/usbd/test_usbd.c
+++ b/test/unit-test/test/device/usbd/test_usbd.c
@@ -124,16 +124,16 @@ void setUp(void)
   dcd_int_disable_Ignore();
   dcd_int_enable_Ignore();
 
-  if ( !tud_inited() )
-  {
-    mscd_init_Expect();
-    dcd_init_Expect(rhport);
-
+  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);
+
     tusb_init(&dev_init);
   }
 }