michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Fix signal shell_thread only when data received

Browse source 
In case when SMP has been enabled, the shell_thread would be signaled
even if no data has been read from fifo.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-08-18 22:26:25 +00:00 • committed by Ioannis Glaropoulos
commit a3d47d9d7d
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/shell/shell_uart.c
View file

@ -41,6 +41,14 @@ static void uart_rx_handle(struct device *dev,
if (len > 0) {
rd_len = uart_fifo_read(dev, data, len);
/* If there is any new data to be either taken into
* ring buffer or consumed by the SMP, signal the
* shell_thread.
*/
if (rd_len > 0) {
new_data = true;
}
#ifdef CONFIG_MCUMGR_SMP_SHELL
/* Divert bytes from shell handling if it is
* part of an mcumgr frame.
@ -55,16 +63,12 @@ static void uart_rx_handle(struct device *dev,
}
rd_len -= i;
new_data = true;
if (rd_len) {
for (uint32_t j = 0; j < rd_len; j++) {
data[j] = data[i + j];
}
}
#else
if (rd_len > 0) {
new_data = true;
}
#endif /* CONFIG_MCUMGR_SMP_SHELL */
int err = ring_buf_put_finish(sh_uart->rx_ringbuf,
rd_len);
@ -81,7 +85,7 @@ static void uart_rx_handle(struct device *dev,
/* If successful in getting byte from the fifo, try
* feeding it to SMP as a part of mcumgr frame.
*/
if (rd_len != 0 &&
if ((rd_len != 0) &&
smp_shell_rx_byte(&sh_uart->ctrl_blk->smp, dummy)) {
new_data = true;
}