sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nshlib: Move BOARDIOC_FINALINIT into nsh_initscript

Browse Source 
1.Avoid the code duplication
2.Call BOARDIOC_FINALINIT onnce and only once
3.Ensure BOARDIOC_FINALINIT get called in all case

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-04-17 02:24:04 +08:00 committed by patacongo
parent 6c4dc44e04
commit ac5632fc50
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nshlib/nsh_altconsole.c
View File

@ -292,12 +292,6 @@ int nsh_consolemain(int argc, char *argv[])
netinit_bringup(); netinit_bringup();
#endif #endif
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */
boardctl(BOARDIOC_FINALINIT, 0);
#endif
/* First map stderr and stdout to alternative devices */ /* First map stderr and stdout to alternative devices */
ret = nsh_clone_console(pstate); ret = nsh_clone_console(pstate);

6
nshlib/nsh_consolemain.c
View File

@ -110,12 +110,6 @@ int nsh_consolemain(int argc, char *argv[])
netinit_bringup(); netinit_bringup();
#endif #endif
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */
boardctl(BOARDIOC_FINALINIT, 0);
#endif
/* Execute the session */ /* Execute the session */
ret = nsh_session(pstate); ret = nsh_session(pstate);

6
nshlib/nsh_script.c
View File

@ -190,6 +190,12 @@ int nsh_initscript(FAR struct nsh_vtbl_s *vtbl)
if (!already) if (!already)
{ {
ret = nsh_script(vtbl, "init", NSH_INITPATH); ret = nsh_script(vtbl, "init", NSH_INITPATH);
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */
boardctl(BOARDIOC_FINALINIT, 0);
#endif
} }
return ret; return ret;

6
nshlib/nsh_usbconsole.c
View File

@ -325,12 +325,6 @@ int nsh_consolemain(int argc, char *argv[])
netinit_bringup(); netinit_bringup();
#endif #endif
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */
boardctl(BOARDIOC_FINALINIT, 0);
#endif
/* Now loop, executing creating a session for each USB connection */ /* Now loop, executing creating a session for each USB connection */
for (;;) for (;;)