michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: uart: Handle RX ring buffer full case

Browse source 
Scenario where RX ring buffer is full and cannot accept
more data was not handled. In that case byte should be
dropped. Such situation may occur when long command is
pasted (exceeding ring buffer size).

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-11-15 11:08:37 +01:00 • committed by Anas Nashif
commit 5af45bd392
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/shell/shell_uart.c
View file

@ -35,13 +35,25 @@ static void uart_rx_handle(const struct shell_uart *sh_uart)
do {
len = ring_buf_put_claim(sh_uart->rx_ringbuf, &data,
sh_uart->rx_ringbuf->size);
rd_len = uart_fifo_read(sh_uart->ctrl_blk->dev, data, len);
if (rd_len) {
new_data = true;
if (len) {
rd_len = uart_fifo_read(sh_uart->ctrl_blk->dev,
data, len);
if (rd_len) {
new_data = true;
}
ring_buf_put_finish(sh_uart->rx_ringbuf, rd_len);
} else {
u8_t dummy;
/* No space in the ring buffer - consume byte. */
LOG_WRN("RX ring buffer full.");
rd_len = uart_fifo_read(sh_uart->ctrl_blk->dev,
&dummy, 1);
}
ring_buf_put_finish(sh_uart->rx_ringbuf, rd_len);
} while (rd_len && (rd_len == len));
if (new_data) {