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: [PATCH] [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(-)

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