Skip to content

Commit 3023707

Browse files
wdfk-progRbb666
authored andcommitted
[driver][serial] V1]: fix correct data loss logic when RX ring buffer is full
In the serial ISR (`rt_hw_serial_isr`), the previous logic for handling a full RX FIFO was flawed. When the buffer was filled, it would increment `get_index` (`get_index += 1`). This had two negative consequences: 1. It effectively discarded the oldest byte of data prematurely. 2. It reduced the usable capacity of a buffer of size N to N-1. For example, a 64-byte buffer could only ever hold 63 readable bytes after becoming full. This patch corrects the behavior by implementing a standard overwriting ring buffer strategy. When the buffer is full, the logic is changed to `get_index = put_index`. This ensures that: - When new data arrives, it correctly overwrites the oldest data. - The `get_index` is advanced along with the `put_index`, correctly marking the new start of the buffer. - The full N-byte capacity of the buffer is utilized, always storing the N most recent bytes. This change resolves the unexpected data loss and makes the buffer behavior correct and predictable.
1 parent 6bb524e commit 3023707

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

components/drivers/serial/dev_serial.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,9 +1463,8 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
14631463
/* if the next position is read index, discard this 'read char' */
14641464
if (rx_fifo->put_index == rx_fifo->get_index)
14651465
{
1466-
rx_fifo->get_index += 1;
1466+
rx_fifo->get_index = rx_fifo->put_index;
14671467
rx_fifo->is_full = RT_TRUE;
1468-
if (rx_fifo->get_index >= serial->config.bufsz) rx_fifo->get_index = 0;
14691468

14701469
_serial_check_buffer_size();
14711470
}

0 commit comments

Comments
 (0)