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

The previous commit was reverted. My concern was misplaced: There is a guard boolean to prevent running the init script more than once. This comment just restores some of the good cosmetic changes that were included in the reverted commit.

Browse Source
This commit is contained in:
Gregory Nutt 2016-08-25 14:28:25 -06:00
parent 4eda22b4db
commit 8cfa1dbd3b
4 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nshlib/nsh_consolemain.c
View File

@ -79,17 +79,17 @@ int nsh_consolemain(int argc, char *argv[])
FAR struct console_stdio_s *pstate = nsh_newconsole(); FAR struct console_stdio_s *pstate = nsh_newconsole();
int ret; int ret;
DEBUGASSERT(pstate); DEBUGASSERT(pstate != NULL);
/* Execute the start-up script */
#ifdef CONFIG_NSH_ROMFSETC #ifdef CONFIG_NSH_ROMFSETC
/* Execute the start-up script */
(void)nsh_initscript(&pstate->cn_vtbl); (void)nsh_initscript(&pstate->cn_vtbl);
#endif #endif
#ifdef CONFIG_NSH_USBDEV_TRACE
/* Initialize any USB tracing options that were requested */ /* Initialize any USB tracing options that were requested */
#ifdef CONFIG_NSH_USBDEV_TRACE
usbtrace_enable(TRACE_BITSET); usbtrace_enable(TRACE_BITSET);
#endif #endif

27
nshlib/nsh_script.c
View File

@ -42,31 +42,8 @@
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) #if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && \
!defined(CONFIG_NSH_DISABLESCRIPT)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

7
nshlib/nsh_session.c
View File

@ -59,12 +59,13 @@
* Name: nsh_session * Name: nsh_session
* *
* Description: * Description:
* This is the common session logic or any NSH session. This function * This is the common session login on any NSH session. This function
* return when an error reading from the input stream occurs, presumably * returns when an error reading from the input stream occurs, presumably
* signaling the end of the session. * signaling the end of the session.
* *
* This function: * This function:
* - Executes the NSH logic script * - Performs the login sequence if so configured
* - Executes the NSH login script
* - Presents a greeting * - Presents a greeting
* - Then provides a prompt then gets and processes the command line. * - Then provides a prompt then gets and processes the command line.
* - This continues until an error occurs, then the session returns. * - This continues until an error occurs, then the session returns.