libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[spi]修复spi总线挂载多设备通信可能失败问题

This commit is contained in:
yangpeng 2024-03-04 17:20:24 +08:00 committed by Meco Man
parent 5e892607fa
commit 1919ad0748
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/drivers/spi/qspi_core.c
View File

@ -15,6 +15,15 @@ rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configu
RT_ASSERT(device != RT_NULL); RT_ASSERT(device != RT_NULL);
RT_ASSERT(cfg != RT_NULL); RT_ASSERT(cfg != RT_NULL);
/* reset the CS pin */
if (device->parent.cs_pin != PIN_NONE)
{
if (cfg->parent.mode & RT_SPI_CS_HIGH)
rt_pin_write(device->parent.cs_pin, PIN_LOW);
else
rt_pin_write(device->parent.cs_pin, PIN_HIGH);
}
/* If the configurations are the same, we don't need to set again. */ /* If the configurations are the same, we don't need to set again. */
if (device->config.medium_size == cfg->medium_size && if (device->config.medium_size == cfg->medium_size &&
device->config.ddr_mode == cfg->ddr_mode && device->config.ddr_mode == cfg->ddr_mode &&

18
components/drivers/spi/spi_core.c
View File

@ -91,15 +91,6 @@ rt_err_t rt_spi_bus_configure(struct rt_spi_device *device)
{ {
rt_err_t result = -RT_ERROR; rt_err_t result = -RT_ERROR;
/* reset the CS pin */
if (device->cs_pin != PIN_NONE)
{
if (device->config.mode & RT_SPI_CS_HIGH)
rt_pin_write(device->cs_pin, PIN_LOW);
else
rt_pin_write(device->cs_pin, PIN_HIGH);
}
if (device->bus != RT_NULL) if (device->bus != RT_NULL)
{ {
result = rt_mutex_take(&(device->bus->lock), RT_WAITING_FOREVER); result = rt_mutex_take(&(device->bus->lock), RT_WAITING_FOREVER);
@ -134,6 +125,15 @@ rt_err_t rt_spi_configure(struct rt_spi_device *device,
RT_ASSERT(device != RT_NULL); RT_ASSERT(device != RT_NULL);
RT_ASSERT(cfg != RT_NULL); RT_ASSERT(cfg != RT_NULL);
/* reset the CS pin */
if (device->cs_pin != PIN_NONE)
{
if (cfg->mode & RT_SPI_CS_HIGH)
rt_pin_write(device->cs_pin, PIN_LOW);
else
rt_pin_write(device->cs_pin, PIN_HIGH);
}
/* If the configurations are the same, we don't need to set again. */ /* If the configurations are the same, we don't need to set again. */
if (device->config.data_width == cfg->data_width && if (device->config.data_width == cfg->data_width &&
device->config.mode == (cfg->mode & RT_SPI_MODE_MASK) && device->config.mode == (cfg->mode & RT_SPI_MODE_MASK) &&