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

[stm32][spi]完善在双工设置下仅开启TX/RX一方DMA的处理

This commit is contained in:
Meco Man 2023-05-28 15:12:27 -04:00 committed by Man, Jianting (Meco)
parent 8e4a8404e3
commit afcc4005b8
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/stm32/libraries/HAL_Drivers/drv_spi.c
View File

@ -364,6 +364,18 @@ static rt_ssize_t spixfer(struct rt_spi_device *device, struct rt_spi_message *m
{ {
state = HAL_SPI_TransmitReceive_DMA(spi_handle, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length); state = HAL_SPI_TransmitReceive_DMA(spi_handle, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length);
} }
else if ((spi_drv->spi_dma_flag & SPI_USING_TX_DMA_FLAG))
{
/* same as Tx ONLY. It will not receive SPI data any more. */
rt_memset((uint8_t *)recv_buf, 0xff, send_length);
state = HAL_SPI_Transmit_DMA(spi_handle, (uint8_t *)send_buf, send_length);
}
else if ((spi_drv->spi_dma_flag & SPI_USING_RX_DMA_FLAG))
{
state = HAL_ERROR;
LOG_E("It shoule be enabled both BSP_SPIx_TX_USING_DMA and BSP_SPIx_TX_USING_DMA flag, if wants to use SPI DMA Rx singly.");
break;
}
else else
{ {
state = HAL_SPI_TransmitReceive(spi_handle, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length, 1000); state = HAL_SPI_TransmitReceive(spi_handle, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length, 1000);
@ -386,9 +398,9 @@ static rt_ssize_t spixfer(struct rt_spi_device *device, struct rt_spi_message *m
__HAL_SPI_DISABLE(spi_handle); __HAL_SPI_DISABLE(spi_handle);
} }
} }
else else if(message->recv_buf)
{ {
memset((uint8_t *)recv_buf, 0xff, send_length); rt_memset((uint8_t *)recv_buf, 0xff, send_length);
if (spi_drv->spi_dma_flag & SPI_USING_RX_DMA_FLAG) if (spi_drv->spi_dma_flag & SPI_USING_RX_DMA_FLAG)
{ {
state = HAL_SPI_Receive_DMA(spi_handle, (uint8_t *)recv_buf, send_length); state = HAL_SPI_Receive_DMA(spi_handle, (uint8_t *)recv_buf, send_length);
@ -400,12 +412,18 @@ static rt_ssize_t spixfer(struct rt_spi_device *device, struct rt_spi_message *m
state = HAL_SPI_Receive(spi_handle, (uint8_t *)recv_buf, send_length, 1000); state = HAL_SPI_Receive(spi_handle, (uint8_t *)recv_buf, send_length, 1000);
} }
} }
else
{
state = HAL_ERROR;
LOG_E("message->send_buf and message->recv_buf are both NULL!");
}
if (state != HAL_OK) if (state != HAL_OK)
{ {
LOG_I("spi transfer error : %d", state); LOG_E("SPI transfer error: %d", state);
message->length = 0; message->length = 0;
spi_handle->State = HAL_SPI_STATE_READY; spi_handle->State = HAL_SPI_STATE_READY;
break;
} }
else else
{ {
@ -418,12 +436,18 @@ static rt_ssize_t spixfer(struct rt_spi_device *device, struct rt_spi_message *m
if (spi_drv->spi_dma_flag & (SPI_USING_TX_DMA_FLAG | SPI_USING_RX_DMA_FLAG)) if (spi_drv->spi_dma_flag & (SPI_USING_TX_DMA_FLAG | SPI_USING_RX_DMA_FLAG))
{ {
/* blocking the thread,and the other tasks can run */ /* blocking the thread,and the other tasks can run */
rt_completion_wait(&spi_drv->cpt, RT_WAITING_FOREVER); if (rt_completion_wait(&spi_drv->cpt, 1000) != RT_EOK)
{
state = HAL_ERROR;
LOG_E("wait for DMA interrupt overtime!");
break;
}
} }
else else
{ {
while (HAL_SPI_GetState(spi_handle) != HAL_SPI_STATE_READY); while (HAL_SPI_GetState(spi_handle) != HAL_SPI_STATE_READY);
} }
#if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) #if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7)
if(dma_buf) if(dma_buf)
{ {