libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-21 03:49:08 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1638 from armink/fix_com_init

Browse Source 
[components][finsh] Fix shell re-initialization check code to support…
This commit is contained in:
Bernard Xiong 2018-07-17 21:14:29 +08:00 committed by GitHub
commit f51a864b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/finsh/shell.c
View File

@ -791,12 +791,6 @@ int finsh_system_init(void)
rt_err_t result = RT_EOK; rt_err_t result = RT_EOK;
rt_thread_t tid; rt_thread_t tid;
if(shell)
{
rt_kprintf("finsh shell already init.\n");
return RT_EOK;
}
#ifdef FINSH_USING_SYMTAB #ifdef FINSH_USING_SYMTAB
#ifdef __CC_ARM /* ARM C Compiler */ #ifdef __CC_ARM /* ARM C Compiler */
extern const int FSymTab$$Base; extern const int FSymTab$$Base;
@ -825,6 +819,12 @@ int finsh_system_init(void)
finsh_system_var_init(&__vsymtab_start, &__vsymtab_end); finsh_system_var_init(&__vsymtab_start, &__vsymtab_end);
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
unsigned int *ptr_begin, *ptr_end; unsigned int *ptr_begin, *ptr_end;
if(shell)
{
rt_kprintf("finsh shell already init.\n");
return RT_EOK;
}
ptr_begin = (unsigned int *)&__fsym_begin; ptr_begin = (unsigned int *)&__fsym_begin;
ptr_begin += (sizeof(struct finsh_syscall) / sizeof(unsigned int)); ptr_begin += (sizeof(struct finsh_syscall) / sizeof(unsigned int));