libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5166 from liukangcc/finsh

Browse Source 
[update] fix finsh_getchar() 未对 shell->device 为空处理的问题
This commit is contained in:
guo 2021-10-14 10:05:03 +08:00 committed by GitHub
commit 33263d7e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/finsh/shell.c
View File

@ -151,15 +151,19 @@ char finsh_getchar(void)
char ch = 0; char ch = 0;
RT_ASSERT(shell != RT_NULL); RT_ASSERT(shell != RT_NULL);
if (shell->device == RT_NULL)
{
return -RT_ERROR;
}
while (rt_device_read(shell->device, -1, &ch, 1) != 1) while (rt_device_read(shell->device, -1, &ch, 1) != 1)
rt_sem_take(&shell->rx_sem, RT_WAITING_FOREVER); rt_sem_take(&shell->rx_sem, RT_WAITING_FOREVER);
return ch; return ch;
#endif #endif /* RT_USING_POSIX */
#else #else
extern char rt_hw_console_getchar(void); extern char rt_hw_console_getchar(void);
return rt_hw_console_getchar(); return rt_hw_console_getchar();
#endif #endif /* RT_USING_DEVICE */
} }
#if !defined(RT_USING_POSIX) && defined(RT_USING_DEVICE) #if !defined(RT_USING_POSIX) && defined(RT_USING_DEVICE)