From 3a7f8b3ac3988eeb653ada6e3efdd7acb68fbe0f Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Tue, 11 May 2021 17:32:52 +0700
Subject: separte tusb_init/inited() to tud/tuh init/inited

add rhport to tud_init()
---
 src/device/usbd.c | 14 +++++++-------
 src/device/usbd.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/device')

diff --git a/src/device/usbd.c b/src/device/usbd.c
index fe18b21b3..280235911 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -242,7 +242,7 @@ static inline usbd_class_driver_t const * get_driver(uint8_t drvid)
 // DCD Event
 //--------------------------------------------------------------------+
 
-static bool _initialized = false;
+static bool _usbd_initialized = false;
 
 // Event queue
 // OPT_MODE_DEVICE is used by OS NONE for mutex (disable usb isr)
@@ -373,13 +373,13 @@ bool tud_connect(void)
 //--------------------------------------------------------------------+
 bool tud_inited(void)
 {
-  return _initialized;
+  return _usbd_initialized;
 }
 
-bool tud_init (void)
+bool tud_init (uint8_t rhport)
 {
   // skip if already initialized
-  if (_initialized) return _initialized;
+  if (_usbd_initialized) return _usbd_initialized;
 
   TU_LOG2("USBD init\r\n");
 
@@ -410,10 +410,10 @@ bool tud_init (void)
   }
 
   // Init device controller driver
-  dcd_init(TUD_OPT_RHPORT);
-  dcd_int_enable(TUD_OPT_RHPORT);
+  dcd_init(rhport);
+  dcd_int_enable(rhport);
 
-  _initialized = true;
+  _usbd_initialized = true;
 
   return true;
 }
diff --git a/src/device/usbd.h b/src/device/usbd.h
index 10fbe0bf1..c0bec9566 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -41,7 +41,7 @@ extern "C" {
 //--------------------------------------------------------------------+
 
 // Init device stack
-bool tud_init (void);
+bool tud_init (uint8_t rhport);
 
 // Check if device stack is already initialized
 bool tud_inited(void);
-- 
cgit v1.3.1