From e83e08343afca86b2bacf26822ef9032571e6f56 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 14 Oct 2024 19:42:22 +0700
Subject: change dcd_init() return from void to bool

---
 src/device/dcd.h  | 2 +-
 src/device/usbd.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/device')

diff --git a/src/device/dcd.h b/src/device/dcd.h
index 64dffbaef..d01f82e01 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -108,7 +108,7 @@ void dcd_dcache_clean_invalidate(void const* addr, uint32_t data_size) TU_ATTR_W
 //--------------------------------------------------------------------+
 
 // Initialize controller to device mode
-void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init);
+bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init);
 
 // Deinitialize controller, unset device mode.
 bool dcd_deinit(uint8_t rhport);
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 4b6600eb2..a730b745b 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -454,7 +454,7 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
   }
   TU_ASSERT(rh_init);
 
-  TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rh_init->rhport,
+  TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rhport,
     rh_init->speed == TUSB_SPEED_HIGH ? "High" : "Full");
   TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(usbd_device_t));
   TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(dcd_event_t));
@@ -490,15 +490,16 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
   _usbd_rhport = rhport;
 
   // Init device controller driver
-  dcd_init(rhport, rh_init);
+  TU_ASSERT(dcd_init(rhport, rh_init));
   dcd_int_enable(rhport);
 
   return true;
 }
 
 bool tud_deinit(uint8_t rhport) {
-  // skip if not initialized
-  if (!tud_inited()) return true;
+  if (!tud_inited()) {
+    return true; // skip if not initialized
+  }
 
   TU_LOG_USBD("USBD deinit on controller %u\r\n", rhport);
 
-- 
cgit v1.3.1