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

Revert "nshlib: Move BOARDIOC_FINALINIT into nsh_initscript"

Browse Source 
This reverts commit ac5632fc504f4e66b61131047326e78c16210d5c.
This commit is contained in:
Xiang Xiao 2020-04-19 22:54:05 +08:00 committed by patacongo
parent 650b58d6b2
commit b1b45de3db
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nshlib/nsh_altconsole.c
View File

@ -294,6 +294,12 @@ int nsh_consolemain(int argc, FAR 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

@ -104,6 +104,12 @@ int nsh_consolemain(int argc, FAR 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, true); ret = nsh_session(pstate, true);

6
nshlib/nsh_script.c
View File

@ -196,12 +196,6 @@ int nsh_initscript(FAR struct nsh_vtbl_s *vtbl)
vtbl->np.np_flags = NSH_NP_SET_OPTIONS_INIT; vtbl->np.np_flags = NSH_NP_SET_OPTIONS_INIT;
#endif #endif
#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

@ -326,6 +326,12 @@ int nsh_consolemain(int argc, FAR 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 (; ; )