Skip to content

[drivers/spi]统一软件SPI配置 #9973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Feb 9, 2025
Merged

[drivers/spi]统一软件SPI配置 #9973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/raspberry-pico/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/renesas/ra6m3-hmi-board/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/libraries/HAL_Drivers/drivers/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']):
Expand Down
4 changes: 2 additions & 2 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) */
1 change: 1 addition & 0 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32f407-atk-explorer/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32f407-fk407m2-zgt6/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32f407-rt-spark/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/wch/risc-v/ch32v208w-r0/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/wch/risc-v/ch32v307v-r1/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsp/wch/risc-v/yd-ch32v307vct6/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 6 additions & 13 deletions components/drivers/spi/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions components/drivers/spi/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand Down