diff --git a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript index 83a63eae5eba0291a6d25883dce2a914d62fb2ad..b6445d228aebd1e179cdad7aafa5540c003c3682 100644 --- a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript @@ -42,7 +42,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_spi_ex.c'] src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_spi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pcd.c'] src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript index 36c204e86097d7eb74f8a6efc2d1d20940f93581..135bb2e98c985a7d23e018228b8302b6fa80cad6 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript @@ -33,7 +33,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c'] src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c'] src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c'] src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c'] diff --git a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript index 37aee932573c4959233f11e60265ae09400aca7d..bf11a01ddccc795d7d60aa8c8dfa311ef6301c2e 100644 --- a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript @@ -28,7 +28,7 @@ if GetDepend(['RT_USING_I2C']): if GetDepend(['RT_USING_SPI']): src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_spi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pccard.c'] src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd.c'] src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32F3xx_HAL/SConscript b/bsp/stm32/libraries/STM32F3xx_HAL/SConscript index d5a4f7d6ccbfe756a167aff56fc147de0b24c6ad..4f48470a5ca94fcd3f12e5eafdcb830e91c31d76 100644 --- a/bsp/stm32/libraries/STM32F3xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F3xx_HAL/SConscript @@ -37,7 +37,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_spi.c'] src += ['STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_spi_ex.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pcd.c'] src += ['STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pcd_ex.c'] src += ['STM32F3xx_HAL_Driver/Src/stm32f3xx_ll_usb.c'] diff --git a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript index 00db00252b855c137686c24562c8608d6afd343e..754566e54cead403396143b6a71a97b67a08ec7f 100644 --- a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript @@ -36,7 +36,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c'] src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c'] src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c'] src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript index 50ec582b66c9cb1a8437f98ac7925ffe2d9f8290..8aec53d69fb968759ae00c371c1addcb90a5b86f 100644 --- a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript @@ -41,7 +41,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_spi_ex.c'] src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_pcd.c'] src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_pcd_ex.c'] src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_hcd.c'] diff --git a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript index 025acb8c57601cf3fba9ffe0520916978e160cda..52d68e9609b307bef4e51fa7788a1ad4cde572c5 100644 --- a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript @@ -37,7 +37,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_spi.c'] src += ['STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pccard.c'] src += ['STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd.c'] src += ['STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript index 2292d8d40fcd9cec6120cb7834c645decb89815d..0f33bf8a0d512e87b9435be3a1a6ec049b96656a 100644 --- a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript @@ -41,7 +41,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_spi.c'] src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): # src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pccard.c'] src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pcd.c'] src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript index 4da0214df9c499b19863797c599054821925d2df..804020e78262ac298d6862e78cf8973d5b3d785f 100644 --- a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript @@ -38,7 +38,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_spi_ex.c'] src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_hcd.c'] src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_pcd.c'] src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript index 4dcd76b9068873db531aa2cd0ce5ab79c97ef2c4..9c3cd968381ff52e44d7a6931aa197762699560b 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript @@ -34,7 +34,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_spi.c'] src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_ll_spi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_pcd.c'] src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_pcd_ex.c'] src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_ll_usb.c'] diff --git a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript index d3e360ddac7447e889bdeaa432bd17c16bcf5460..134b47cf522d13ba9c5d94978d16cf6c8136752a 100644 --- a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript @@ -41,7 +41,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c'] src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_hcd.c'] src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd.c'] src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript index ce482829bd3a25afddcece3f0fdf9b1015d7ea3b..746d83532659dbfbc044f8b77cd937a92e216215 100644 --- a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript @@ -35,7 +35,7 @@ if GetDepend(['RT_USING_SERIAL']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_uart.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_uart_ex.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_pccard.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_pcd.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_pcd_ex.c'] diff --git a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript index 75372b529e334daaf96d4220c36f7e23a417a80f..9245975aee16b502843c75b1e632ac6cee213031 100644 --- a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript @@ -42,7 +42,7 @@ if GetDepend(['RT_USING_SPI']): src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c'] src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c'] -if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']): +if GetDepend(['RT_USING_USB']): # src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hcd.c'] src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c'] src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd_ex.c'] diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index d3fd14b52dde801a99264bb0e04ba32d34e03131..159a6cbda31a1b2e3e955ca34c9544ad3bec1d8c 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -623,9 +623,14 @@ menuconfig RT_USING_WIFI endif menu "Using USB" + config RT_USING_USB + bool + default n + config RT_USING_USB_HOST bool "Using USB host" default n + select RT_USING_USB if RT_USING_USB_HOST config RT_USBH_MSTORAGE @@ -648,6 +653,8 @@ menu "Using USB" config RT_USING_USB_DEVICE bool "Using USB device" default n + select RT_USING_USB + if RT_USING_USB_DEVICE || RT_USING_USB_HOST config RT_USBD_THREAD_STACK_SZ int "usb thread stack size"