From d83d71cc057a32927a8156616339b776fa72af3f Mon Sep 17 00:00:00 2001 From: Rbb666 Date: Sat, 8 Feb 2025 13:15:30 +0800 Subject: [PATCH] =?UTF-8?q?[drivers/spi]=E7=BB=9F=E4=B8=80=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6SPI=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lpc55sxx/lpc55s69_nxp_evk/board/Kconfig | 2 +- bsp/raspberry-pico/board/Kconfig | 2 +- bsp/renesas/ra6m3-hmi-board/board/Kconfig | 2 +- .../libraries/HAL_Drivers/drivers/SConscript | 2 +- .../HAL_Drivers/drivers/drv_soft_spi.c | 4 ++-- .../libraries/HAL_Drivers/drivers/drv_spi.c | 1 + .../stm32f407-atk-explorer/board/Kconfig | 2 +- .../stm32f407-fk407m2-zgt6/board/Kconfig | 2 +- .../stm32f407-lckfb-skystar/board/Kconfig | 2 +- bsp/stm32/stm32f407-rt-spark/board/Kconfig | 2 +- bsp/wch/risc-v/ch32v208w-r0/board/Kconfig | 2 +- bsp/wch/risc-v/ch32v307v-r1/board/Kconfig | 2 +- bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig | 2 +- components/drivers/spi/Kconfig | 19 ++++++------------- components/drivers/spi/SConscript | 4 +--- 15 files changed, 21 insertions(+), 29 deletions(-) diff --git a/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig b/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig index 18850d8bf2..1ca764c295 100644 --- a/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig +++ b/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig @@ -174,7 +174,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_PIN - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_SPI if BSP_USING_SOFT_SPI config BSP_USING_SOFT_SPI1 diff --git a/bsp/raspberry-pico/board/Kconfig b/bsp/raspberry-pico/board/Kconfig index b4201827b7..bffb545386 100644 --- a/bsp/raspberry-pico/board/Kconfig +++ b/bsp/raspberry-pico/board/Kconfig @@ -154,7 +154,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_PIN - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_SPI if BSP_USING_SOFT_SPI config BSP_USING_SOFT_SPI0 diff --git a/bsp/renesas/ra6m3-hmi-board/board/Kconfig b/bsp/renesas/ra6m3-hmi-board/board/Kconfig index 0c88511a25..db9325579d 100644 --- a/bsp/renesas/ra6m3-hmi-board/board/Kconfig +++ b/bsp/renesas/ra6m3-hmi-board/board/Kconfig @@ -202,7 +202,7 @@ menu "Hardware Drivers Config" bool "Enable soft SPI BUS" default n select RT_USING_PIN - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_SPI if BSP_USING_SOFT_SPI config BSP_USING_SOFT_SPI1 diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/SConscript b/bsp/stm32/libraries/HAL_Drivers/drivers/SConscript index 3a836bd427..12fac19061 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drivers/SConscript +++ b/bsp/stm32/libraries/HAL_Drivers/drivers/SConscript @@ -29,7 +29,7 @@ if GetDepend(['RT_USING_SPI']): if GetDepend(['RT_USING_QSPI']): src += ['drv_qspi.c'] -if GetDepend('RT_USING_SPI_BITOPS'): +if GetDepend('RT_USING_SOFT_SPI'): src += ['drv_soft_spi.c'] if GetDepend(['RT_USING_I2C', 'RT_USING_I2C_BITOPS']): diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c index ff9e12473d..a612defa20 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c @@ -12,7 +12,7 @@ #include "drv_soft_spi.h" #include "drv_config.h" -#if defined(RT_USING_SPI) && defined(RT_USING_SPI_BITOPS) && defined(RT_USING_PIN) +#if defined(RT_USING_SPI) && defined(RT_USING_SOFT_SPI) && defined(RT_USING_PIN) //#define DRV_DEBUG #define LOG_TAG "drv.soft_spi" @@ -203,4 +203,4 @@ int rt_hw_softspi_init(void) } INIT_BOARD_EXPORT(rt_hw_softspi_init); -#endif /* defined(RT_USING_SPI) && defined(RT_USING_SPI_BITOPS) && defined(RT_USING_PIN) */ +#endif /* defined(RT_USING_SPI) && defined(RT_USING_SOFT_SPI) && defined(RT_USING_PIN) */ diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c index c08f33efca..3a7bf68125 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c @@ -534,6 +534,7 @@ static rt_err_t spi_configure(struct rt_spi_device *device, struct stm32_spi *spi_drv = rt_container_of(device->bus, struct stm32_spi, spi_bus); spi_drv->cfg = configuration; + rt_kprintf("@spi_configure\n"); return stm32_spi_init(spi_drv, configuration); } diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index 864b89a841..39abe46ffa 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig @@ -288,7 +288,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_SPI - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_PIN if BSP_USING_SOFT_SPI menuconfig BSP_USING_SOFT_SPI1 diff --git a/bsp/stm32/stm32f407-fk407m2-zgt6/board/Kconfig b/bsp/stm32/stm32f407-fk407m2-zgt6/board/Kconfig index 167b97c2c3..68188add69 100644 --- a/bsp/stm32/stm32f407-fk407m2-zgt6/board/Kconfig +++ b/bsp/stm32/stm32f407-fk407m2-zgt6/board/Kconfig @@ -161,7 +161,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_SPI - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_PIN if BSP_USING_SOFT_SPI menuconfig BSP_USING_SOFT_SPI1 diff --git a/bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig b/bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig index 8e382b92c8..56d04b4cd3 100644 --- a/bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig +++ b/bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig @@ -231,7 +231,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_SPI - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_PIN if BSP_USING_SOFT_SPI menuconfig BSP_USING_SOFT_SPI1 diff --git a/bsp/stm32/stm32f407-rt-spark/board/Kconfig b/bsp/stm32/stm32f407-rt-spark/board/Kconfig index 9df736bfee..0a6fcc5642 100644 --- a/bsp/stm32/stm32f407-rt-spark/board/Kconfig +++ b/bsp/stm32/stm32f407-rt-spark/board/Kconfig @@ -454,7 +454,7 @@ menu "On-chip Peripheral Drivers" bool "Enable soft SPI BUS" default n select RT_USING_SPI - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_PIN if BSP_USING_SOFT_SPI menuconfig BSP_USING_SOFT_SPI1 diff --git a/bsp/wch/risc-v/ch32v208w-r0/board/Kconfig b/bsp/wch/risc-v/ch32v208w-r0/board/Kconfig index 567e4ce6b5..4eb338e84d 100644 --- a/bsp/wch/risc-v/ch32v208w-r0/board/Kconfig +++ b/bsp/wch/risc-v/ch32v208w-r0/board/Kconfig @@ -164,7 +164,7 @@ menu "On-chip Peripheral Drivers" menuconfig BSP_USING_SPI bool "Enable SPI" - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI select RT_USING_SPI if BSP_USING_SPI diff --git a/bsp/wch/risc-v/ch32v307v-r1/board/Kconfig b/bsp/wch/risc-v/ch32v307v-r1/board/Kconfig index 23c3f1eb3d..d9275a620e 100644 --- a/bsp/wch/risc-v/ch32v307v-r1/board/Kconfig +++ b/bsp/wch/risc-v/ch32v307v-r1/board/Kconfig @@ -222,7 +222,7 @@ menu "On-chip Peripheral Drivers" menuconfig BSP_USING_SOFT_SPI bool "Enable SOFT SPI" - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI if BSP_USING_SOFT_SPI config BSP_USING_SOFT_SPI1 diff --git a/bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig b/bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig index 331bb9c8cf..c20f233f30 100644 --- a/bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig +++ b/bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig @@ -161,7 +161,7 @@ menu "On-chip Peripheral Drivers" menuconfig BSP_USING_SOFT_SPI bool "Enable SOFT SPI" - select RT_USING_SPI_BITOPS + select RT_USING_SOFT_SPI if BSP_USING_SOFT_SPI config BSP_USING_SOFT_SPI1 diff --git a/components/drivers/spi/Kconfig b/components/drivers/spi/Kconfig index f2fbd7edad..4b95a18bfe 100644 --- a/components/drivers/spi/Kconfig +++ b/components/drivers/spi/Kconfig @@ -3,22 +3,11 @@ config RT_USING_SPI default n if RT_USING_SPI - config RT_USING_SPI_BITOPS - select RT_USING_PIN - bool "Use GPIO to simulate SPI" - default n - - if RT_USING_SPI_BITOPS - config RT_SPI_BITOPS_DEBUG - bool "Use simulate SPI debug message" - default n - endif menuconfig RT_USING_SOFT_SPI - bool "Use GPIO to soft simulate SPI" + bool "Use GPIO to simulate SPI" default n select RT_USING_PIN - select RT_USING_SPI_BITOPS if RT_USING_SOFT_SPI menuconfig RT_USING_SOFT_SPI0 bool "Enable SPI0 Bus (software simulation)" @@ -188,9 +177,13 @@ config RT_USING_SPI range 0 32767 default 1 endif - endif + config RT_SPI_BITOPS_DEBUG + bool "Use simulate SPI debug message" + depends on RT_USING_SOFT_SPI + default n + config RT_USING_QSPI bool "Enable QSPI mode" default n diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index fc608c46ae..df0ffb7141 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -7,10 +7,8 @@ src = ['dev_spi_core.c', 'dev_spi.c'] CPPPATH = [cwd, cwd + '/../include'] LOCAL_CFLAGS = '' -if GetDepend('RT_USING_SPI_BITOPS'): - src += ['dev_spi_bit_ops.c'] - if GetDepend('RT_USING_SOFT_SPI'): + src += ['dev_spi_bit_ops.c'] src += ['dev_soft_spi.c'] if GetDepend('RT_USING_QSPI'):