Skip to content

[drivers][serial_v2] 修复dma下rx_flush的bug #10529

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
Jul 24, 2025
Merged

[drivers][serial_v2] 修复dma下rx_flush的bug #10529

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
16 changes: 5 additions & 11 deletions components/drivers/serial/dev_serial_v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ static rt_err_t rt_serial_rx_enable(struct rt_device *dev,
serial->config.rx_bufsz = RT_SERIAL_RX_MINBUFSZ;

#ifdef RT_SERIAL_USING_DMA
if (serial->config.dma_ping_bufsz > 0 && serial->config.dma_ping_bufsz < RT_SERIAL_RX_MINBUFSZ / 2)
if (serial->config.dma_ping_bufsz < RT_SERIAL_RX_MINBUFSZ / 2)
serial->config.dma_ping_bufsz = RT_SERIAL_RX_MINBUFSZ / 2;
rx_fifo_size = sizeof(struct rt_serial_rx_fifo) + serial->config.rx_bufsz + serial->config.dma_ping_bufsz;
#else
Expand All @@ -959,12 +959,9 @@ static rt_err_t rt_serial_rx_enable(struct rt_device *dev,
serial->config.rx_bufsz);

#ifdef RT_SERIAL_USING_DMA
if (serial->config.dma_ping_bufsz > 0)
{
rt_ringbuffer_init(&rx_fifo->dma_ping_rb,
(rt_uint8_t *)rx_fifo + sizeof(struct rt_serial_rx_fifo) + serial->config.rx_bufsz,
serial->config.dma_ping_bufsz);
}
rt_ringbuffer_init(&rx_fifo->dma_ping_rb,
(rt_uint8_t *)rx_fifo + sizeof(struct rt_serial_rx_fifo) + serial->config.rx_bufsz,
serial->config.dma_ping_bufsz);
#endif

serial->serial_rx = rx_fifo;
Expand Down Expand Up @@ -1219,10 +1216,7 @@ static void _serial_rx_flush(struct rt_serial_device *serial)
rt_ringbuffer_reset(&rx_fifo->rb);
rx_fifo->rx_cpt_index = 0;
#ifdef RT_SERIAL_USING_DMA
if (serial->config.dma_ping_bufsz > 0)
{
rt_ringbuffer_reset(&rx_fifo->dma_ping_rb);
}
rt_serial_update_read_index(&rx_fifo->dma_ping_rb, rt_ringbuffer_get_size(&rx_fifo->dma_ping_rb));
#endif
rt_spin_unlock_irqrestore(&serial->spinlock, level);
}
Expand Down