michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: fix possible hanging reason when history feature is used

Browse source 
Fixed possible race condition.

Signed-off-by: Jakub Rzeszutko <jakub.rzeszutko@nordicsemi.no>
This commit is contained in:
Jakub Rzeszutko 2018-10-11 14:51:13 +02:00 • committed by Carles Cufí
commit 2445ba7a26
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/shell/shell.c
View file

@ -698,8 +698,7 @@ static void shell_tab_handle(const struct shell *shell)
#define SHELL_ASCII_MAX_CHAR (127u)
static inline int ascii_filter(const char data)
{
return (u8_t) data > SHELL_ASCII_MAX_CHAR ?
-EINVAL : 0;
return (u8_t) data > SHELL_ASCII_MAX_CHAR ? -EINVAL : 0;
}
static void metakeys_handle(const struct shell *shell, char data)

3
subsys/shell/shell_uart.c
View file

@ -73,7 +73,9 @@ static int read(const struct shell_transport *transport,
void *data, size_t length, size_t *cnt)
{
struct shell_uart *sh_uart = (struct shell_uart *)transport->ctx;
u32_t key;
key = irq_lock();
if (sh_uart->rx_cnt) {
memcpy(data, sh_uart->rx, 1);
sh_uart->rx_cnt = 0;
@ -81,6 +83,7 @@ static int read(const struct shell_transport *transport,
} else {
*cnt = 0;
}
irq_unlock(key);
return 0;
}