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

net/bringup: late net init after nsh script done

Browse Source
This commit is contained in:
chao.an 2020-02-19 20:34:52 +08:00 committed by Ouss4
parent ee615f0568
commit 86bfe13399
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nshlib/nsh_altconsole.c
View File

@ -50,6 +50,8 @@
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
#include "netutils/netinit.h"
#if defined(CONFIG_NSH_ALTCONDEV) && !defined(HAVE_USB_CONSOLE) #if defined(CONFIG_NSH_ALTCONDEV) && !defined(HAVE_USB_CONSOLE)
/**************************************************************************** /****************************************************************************
@ -284,6 +286,12 @@ int nsh_consolemain(int argc, char *argv[])
nsh_initscript(&pstate->cn_vtbl); nsh_initscript(&pstate->cn_vtbl);
#endif #endif
#ifdef CONFIG_NSH_NETINIT
/* Bring up the network */
netinit_bringup();
#endif
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT) #if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */ /* Perform architecture-specific final-initialization (if configured) */

8
nshlib/nsh_consolemain.c
View File

@ -47,6 +47,8 @@
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
#include "netutils/netinit.h"
#if !defined(CONFIG_NSH_ALTCONDEV) && !defined(HAVE_USB_CONSOLE) && \ #if !defined(CONFIG_NSH_ALTCONDEV) && !defined(HAVE_USB_CONSOLE) && \
!defined(HAVE_USB_KEYBOARD) !defined(HAVE_USB_KEYBOARD)
@ -96,6 +98,12 @@ int nsh_consolemain(int argc, char *argv[])
#endif #endif
#endif #endif
#ifdef CONFIG_NSH_NETINIT
/* Bring up the network */
netinit_bringup();
#endif
#ifdef CONFIG_NSH_USBDEV_TRACE #ifdef CONFIG_NSH_USBDEV_TRACE
/* Initialize any USB tracing options that were requested */ /* Initialize any USB tracing options that were requested */

7
nshlib/nsh_init.c
View File

@ -42,7 +42,6 @@
#include <sys/boardctl.h> #include <sys/boardctl.h>
#include "system/readline.h" #include "system/readline.h"
#include "netutils/netinit.h"
#include "nshlib/nshlib.h" #include "nshlib/nshlib.h"
#include "nsh.h" #include "nsh.h"
@ -103,10 +102,4 @@ void nsh_initialize(void)
boardctl(BOARDIOC_INIT, 0); boardctl(BOARDIOC_INIT, 0);
#endif #endif
#ifdef CONFIG_NSH_NETINIT
/* Bring up the network */
netinit_bringup();
#endif
} }

8
nshlib/nsh_usbconsole.c
View File

@ -59,6 +59,8 @@
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
#include "netutils/netinit.h"
#ifdef HAVE_USB_CONSOLE #ifdef HAVE_USB_CONSOLE
/**************************************************************************** /****************************************************************************
@ -317,6 +319,12 @@ int nsh_consolemain(int argc, char *argv[])
nsh_initscript(&pstate->cn_vtbl); nsh_initscript(&pstate->cn_vtbl);
#endif #endif
#ifdef CONFIG_NSH_NETINIT
/* Bring up the network */
netinit_bringup();
#endif
#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT) #if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */ /* Perform architecture-specific final-initialization (if configured) */