RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sys/usb/usbus: enable USBUS stdio_cdc_acm only if tinyUSB is not used

Browse Source
This commit is contained in:
Gunar Schorcht 2022-11-30 18:00:36 +01:00
parent 945af26648
commit 93215df868
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boards/common/makefiles/stdio_cdc_acm.dep.mk
View File

@ -1,5 +1,11 @@
ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE))))
# Use stdio_cdc_acm only if no other stdio is requested explicitly.
USEMODULE += stdio_cdc_acm
ifneq (,$(filter tinyusb_device,$(USEMODULE)))
# Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly
# and tinyusb_device is used for any other reason
USEMODULE += stdio_tinyusb_cdc_acm
else
# Use stdio_cdc_acm only if no other stdio is requested explicitly.
USEMODULE += stdio_cdc_acm
endif
FEATURES_REQUIRED += highlevel_stdio
endif

2
sys/usb/usbus/cdc/acm/Kconfig
View File

@ -56,7 +56,7 @@ choice STDIO_IMPLEMENTATION
config MODULE_STDIO_CDC_ACM
bool "CDC ACM"
depends on MODULE_USBUS_CDC_ACM
depends on MODULE_USBUS_CDC_ACM && !MODULE_TINYUSB_DEVICE
select MODULE_ISRPIPE
select MODULE_STDIO_AVAILABLE