andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix multiple flag on compiling

Browse Source
This commit is contained in:
hathach
2024-11-27 11:10:06 +07:00
parent 63771086d9
commit 453d69517b
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hw/bsp/espressif/components/tinyusb_src/CMakeLists.txt
View File

@@ -69,6 +69,7 @@ if (DEFINED LOG)
endif() endif()
if(DEFINED CFLAGS_CLI) if(DEFINED CFLAGS_CLI)
separate_arguments(CFLAGS_CLI)
list(APPEND compile_definitions ${CFLAGS_CLI}) list(APPEND compile_definitions ${CFLAGS_CLI})
endif() endif()

2
hw/bsp/family_support.cmake
View File

@@ -206,6 +206,7 @@ function(family_configure_common TARGET RTOS)
# compile define from command line # compile define from command line
if(DEFINED CFLAGS_CLI) if(DEFINED CFLAGS_CLI)
separate_arguments(CFLAGS_CLI)
target_compile_options(${TARGET} PUBLIC ${CFLAGS_CLI}) target_compile_options(${TARGET} PUBLIC ${CFLAGS_CLI})
endif() endif()
@@ -291,6 +292,7 @@ function(family_add_tinyusb TARGET OPT_MCU RTOS)
# compile define from command line # compile define from command line
if(DEFINED CFLAGS_CLI) if(DEFINED CFLAGS_CLI)
separate_arguments(CFLAGS_CLI)
target_compile_options(${TARGET}-tinyusb PUBLIC ${CFLAGS_CLI}) target_compile_options(${TARGET}-tinyusb PUBLIC ${CFLAGS_CLI})
endif() endif()

1
hw/bsp/rp2040/family.cmake
View File

@@ -191,6 +191,7 @@ function(family_configure_target TARGET RTOS)
# compile define from command line # compile define from command line
if(DEFINED CFLAGS_CLI) if(DEFINED CFLAGS_CLI)
separate_arguments(CFLAGS_CLI)
target_compile_options(${TARGET} PUBLIC ${CFLAGS_CLI}) target_compile_options(${TARGET} PUBLIC ${CFLAGS_CLI})
endif() endif()

2
src/class/msc/msc_device.c
View File

@@ -147,7 +147,7 @@ static inline uint16_t rdwr10_get_blocksize(msc_cbw_t const* cbw) {
return (uint16_t) (cbw->total_bytes / block_count); return (uint16_t) (cbw->total_bytes / block_count);
} }
uint8_t rdwr10_validate_cmd(msc_cbw_t const* cbw) { static uint8_t rdwr10_validate_cmd(msc_cbw_t const* cbw) {
uint8_t status = MSC_CSW_STATUS_PASSED; uint8_t status = MSC_CSW_STATUS_PASSED;
uint16_t const block_count = rdwr10_get_blockcount(cbw); uint16_t const block_count = rdwr10_get_blockcount(cbw);

10
test/hil/tinyusb.json
View File

@@ -14,13 +14,14 @@
"name": "esptool", "name": "esptool",
"uid": "4ea4f48f6bc3ee11bbb9d00f9e1b1c54", "uid": "4ea4f48f6bc3ee11bbb9d00f9e1b1c54",
"args": "-b 1500000" "args": "-b 1500000"
} },
"comment": "Use TS3USB30 mux to test both device and host"
}, },
{ {
"name": "espressif_s3_devkitm", "name": "espressif_s3_devkitm",
"uid": "84F703C084E4", "uid": "84F703C084E4",
"build" : { "build" : {
"flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE CFG_TUH_DWC2_DMA_ENABLE"] "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
}, },
"tests": { "tests": {
"only": ["device/cdc_msc_freertos", "device/hid_composite_freertos"] "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos"]
@@ -133,7 +134,7 @@
"name": "stm32f723disco", "name": "stm32f723disco",
"uid": "460029001951373031313335", "uid": "460029001951373031313335",
"build" : { "build" : {
"flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE CFG_TUH_DWC2_DMA_ENABLE"] "flags_on": ["", "CFG_TUH_DWC2_DMA_ENABLE"]
}, },
"tests": { "tests": {
"device": true, "host": true, "dual": false, "device": true, "host": true, "dual": false,
@@ -143,7 +144,8 @@
"name": "jlink", "name": "jlink",
"uid": "000776606156", "uid": "000776606156",
"args": "-device stm32f723ie" "args": "-device stm32f723ie"
} },
"comment": "Device port0 FS (slave only), Host port1 HS with DMA"
}, },
{ {
"name": "stm32h743nucleo", "name": "stm32h743nucleo",