diff options
| author | HiFiPhile <[email protected]> | 2024-05-27 20:10:44 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-27 20:10:44 +0200 |
| commit | 003a5d4f5551de809715c8bc7ed203d34720a085 (patch) | |
| tree | 575dee1a6306ef4bb345a3355faf7e2eac9ca70c /lib/rt-thread | |
| parent | a9745c9818da85a0b31ef04c556530a3bef18ec1 (diff) | |
| parent | fd11bf17fde6cbfdb4bb1ed7070ed4111e503ae8 (diff) | |
Merge branch 'master' into additional_dcd_sof_enable
Diffstat (limited to 'lib/rt-thread')
| -rw-r--r-- | lib/rt-thread/SConscript | 2 | ||||
| -rw-r--r-- | 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 |