From 4cecb759c9cc5854a12380814bc49a8efddcea3c Mon Sep 17 00:00:00 2001
From: Rbb666 <zhangbingru@rt-thread.com>
Date: Sat, 11 May 2024 16:47:15 +0800
Subject: [osal]add usb host script.

---
 lib/rt-thread/SConscript | 52 +++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

(limited to 'lib/rt-thread/SConscript')

diff --git a/lib/rt-thread/SConscript b/lib/rt-thread/SConscript
index 205e12958..482f6d7b2 100644
--- a/lib/rt-thread/SConscript
+++ b/lib/rt-thread/SConscript
@@ -5,32 +5,44 @@ cwd     = GetCurrentDir()
 src     = Split("""
 ../../src/tusb.c
 ../../src/common/tusb_fifo.c
-../../src/device/usbd.c
-../../src/device/usbd_control.c
 ./tusb_rt_thread_port.c
 """)
 path = [cwd, cwd + "/../../src"]
 
-# BSP
-if GetDepend(["SOC_FAMILY_STM32"]):
-    src += ["../../src/portable/synopsys/dwc2/dcd_dwc2.c",
-            "../../src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c"]
-
-if GetDepend(["SOC_NRF52840"]):
-    src += ["../../src/portable/nordic/nrf5x/dcd_nrf5x.c"]
-
-if GetDepend(["SOC_FAMILY_RENESAS"]):
-    src += ["../../src/portable/renesas/rusb2/dcd_rusb2.c",
-            "../../src/portable/renesas/rusb2/rusb2_common.c"]
-
-# Device class
-if GetDepend(["PKG_TINYUSB_DEVICE_CDC"]):
-    src += ["../../src/class/cdc/cdc_device.c"]
+LOCAL_CFLAGS = ''
 
-if GetDepend(["PKG_TINYUSB_DEVICE_MSC"]):
-    src += ["../../src/class/msc/msc_device.c", "port/msc_device_port.c"]
+# for device stack
+if GetDepend(["PKG_TINYUSB_DEVICE_ENABLE"]):
+    src += ["../../src/device/usbd.c",
+            "../../src/device/usbd_control.c"]
+    # BSP
+    if GetDepend(["SOC_FAMILY_STM32"]):
+        src += ["../../src/portable/synopsys/dwc2/dcd_dwc2.c",
+                "../../src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c"]
+
+    if GetDepend(["SOC_NRF52840"]):
+        src += ["../../src/portable/nordic/nrf5x/dcd_nrf5x.c"]
+
+    if GetDepend(["SOC_FAMILY_RENESAS"]):
+        src += ["../../src/portable/renesas/rusb2/dcd_rusb2.c",
+                "../../src/portable/renesas/rusb2/rusb2_common.c"]
+
+    # Device class
+    if GetDepend(["PKG_TINYUSB_DEVICE_UVC"]):
+        src += ["../../src/class/video/video_device.c"]
+    if GetDepend(["PKG_TINYUSB_DEVICE_CDC"]):
+        src += ["../../src/class/cdc/cdc_device.c"]
+    if GetDepend(["PKG_TINYUSB_DEVICE_MSC"]):
+        src += ["../../src/class/msc/msc_device.c", "port/msc_device_port.c"]
+
+# for host stack
+if GetDepend(["PKG_TINYUSB_HOST_ENABLE"]):
+    src += ["../../src/host/usbh.c", "../../src/host/hub.c"]
+
+    if GetDepend(["SOC_FAMILY_RENESAS"]):
+        src += ["../../src/portable/renesas/rusb2/hcd_rusb2.c",
+                "../../src/portable/renesas/rusb2/rusb2_common.c"]
 
-LOCAL_CFLAGS = ''
 
 if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'armclang': # GCC or Keil AC6
     LOCAL_CFLAGS += ' -std=c99'
-- 
cgit v1.3.1


From 2c880012f7904cc19c73e4e246214b75e61a44df Mon Sep 17 00:00:00 2001
From: Rbb666 <zhangbingru@rt-thread.com>
Date: Thu, 23 May 2024 15:48:21 +0800
Subject: [osal]Add usb-device and host macro controls.

---
 lib/rt-thread/SConscript    | 2 ++
 lib/rt-thread/tusb_config.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/rt-thread/SConscript')

diff --git a/lib/rt-thread/SConscript b/lib/rt-thread/SConscript
index 482f6d7b2..34399fd45 100644
--- a/lib/rt-thread/SConscript
+++ b/lib/rt-thread/SConscript
@@ -34,6 +34,8 @@ if GetDepend(["PKG_TINYUSB_DEVICE_ENABLE"]):
         src += ["../../src/class/cdc/cdc_device.c"]
     if GetDepend(["PKG_TINYUSB_DEVICE_MSC"]):
         src += ["../../src/class/msc/msc_device.c", "port/msc_device_port.c"]
+    if GetDepend(["PKG_TINYUSB_DEVICE_HID"]):
+        src += ["../../src/class/hid/hid_device.c"]
 
 # for host stack
 if GetDepend(["PKG_TINYUSB_HOST_ENABLE"]):
diff --git a/lib/rt-thread/tusb_config.h b/lib/rt-thread/tusb_config.h
index b3c3bf43f..11dc21983 100644
--- a/lib/rt-thread/tusb_config.h
+++ b/lib/rt-thread/tusb_config.h
@@ -152,12 +152,12 @@ extern "C" {
   #define CFG_TUH_ENABLED             (0)
 #endif
 
-#if (PKG_TINYUSB_HOST_PORT == 0)
+#if (PKG_TINYUSB_HOST_PORT == 0) && defined(PKG_TINYUSB_HOST_ENABLE)
 #undef CFG_TUSB_RHPORT0_MODE
 #define CFG_TUSB_RHPORT0_MODE     (OPT_MODE_HOST | PKG_TINYUSB_HOST_PORT_SPEED)
 #endif
 
-#if (PKG_TINYUSB_HOST_PORT == 1)
+#if (PKG_TINYUSB_HOST_PORT == 1) && defined(PKG_TINYUSB_HOST_ENABLE)
 #undef CFG_TUSB_RHPORT1_MODE
 #define CFG_TUSB_RHPORT1_MODE     (OPT_MODE_HOST | PKG_TINYUSB_HOST_PORT_SPEED)
 #endif
-- 
cgit v1.3.1