libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HUST CSE]fix:修改drv_spi.c空指针问题

Browse Source
This commit is contained in:
nobody 2023-04-29 20:50:21 +08:00 committed by Man, Jianting (Meco)
parent 8d526a72b4
commit 613e5a3e51
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsp/at32/libraries/rt_drivers/drv_spi.c
View File

@ -393,8 +393,15 @@ static rt_ssize_t xfer(struct rt_spi_device* device, struct rt_spi_message* mess
/* calculate the start address */ /* calculate the start address */
already_send_length = message->length - send_length - message_length; already_send_length = message->length - send_length - message_length;
/* avoid null pointer problems */
if (message->send_buf)
{
send_buf = (rt_uint8_t *)message->send_buf + already_send_length; send_buf = (rt_uint8_t *)message->send_buf + already_send_length;
}
if (message->recv_buf)
{
recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length; recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length;
}
/* start once data exchange in dma mode */ /* start once data exchange in dma mode */
if (message->send_buf && message->recv_buf) if (message->send_buf && message->recv_buf)

8
bsp/hc32/libraries/hc32_drivers/drv_spi.c
View File

@ -441,8 +441,16 @@ static rt_uint32_t hc32_spi_xfer(struct rt_spi_device *device, struct rt_spi_mes
/* calculate the start address */ /* calculate the start address */
already_send_length = message->length - send_length - message_length; already_send_length = message->length - send_length - message_length;
/* avoid null pointer problems */
if (message->send_buf)
{
send_buf = (rt_uint8_t *)message->send_buf + already_send_length; send_buf = (rt_uint8_t *)message->send_buf + already_send_length;
}
if (message->recv_buf)
{
recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length; recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length;
}
if (message->send_buf && message->recv_buf) if (message->send_buf && message->recv_buf)
{ {
if ((spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_TX) && (spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_RX)) if ((spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_TX) && (spi_drv->spi_dma_flag & RT_DEVICE_FLAG_DMA_RX))

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

@ -329,8 +329,15 @@ static rt_ssize_t spixfer(struct rt_spi_device *device, struct rt_spi_message *m
/* calculate the start address */ /* calculate the start address */
already_send_length = message->length - send_length - message_length; already_send_length = message->length - send_length - message_length;
/* avoid null pointer problems */
if (message->send_buf)
{
send_buf = (rt_uint8_t *)message->send_buf + already_send_length; send_buf = (rt_uint8_t *)message->send_buf + already_send_length;
}
if (message->recv_buf)
{
recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length; recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length;
}
#if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) #if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7)
rt_uint32_t* dma_buf = RT_NULL; rt_uint32_t* dma_buf = RT_NULL;

7
bsp/wch/risc-v/Libraries/ch32_drivers/drv_spi.c
View File

@ -410,8 +410,15 @@ static rt_ssize_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message *
/* calculate the start address */ /* calculate the start address */
already_send_length = message->length - send_length - message_length; already_send_length = message->length - send_length - message_length;
/* avoid null pointer problems */
if (message->send_buf)
{
send_buf = (rt_uint8_t *)message->send_buf + already_send_length; send_buf = (rt_uint8_t *)message->send_buf + already_send_length;
}
if (message->recv_buf)
{
recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length; recv_buf = (rt_uint8_t *)message->recv_buf + already_send_length;
}
/* start once data exchange */ /* start once data exchange */
if (message->send_buf && message->recv_buf) if (message->send_buf && message->recv_buf)