diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 12:14:16 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 12:14:16 -0600 |
| commit | 50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21 (patch) | |
| tree | d294f42bc878ea47a5787a8cab0ac96480407a55 /apps/nshlib/nsh.h | |
| parent | 73a89efed06a03f2733c14e42553ad23223f5cad (diff) | |
| download | px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.tar.gz px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.tar.bz2 px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.zip | |
NSH initialization now calls boardctl(BOARDIOC_INIT) instead of board_app_initaliaze. Modify all configurations: Make sure that CONFIG_LIB_BOARDCTL=y appears wherever CONFIG_NSH_ARCHINIT=y appears. Remove support for CONFIG_NSH_ARCHMAC. It is not used and there are better ways to do that operation
Diffstat (limited to 'apps/nshlib/nsh.h')
| -rw-r--r-- | apps/nshlib/nsh.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index f9f5e1468..4d612a490 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -128,10 +128,6 @@ # define CONFIG_NSH_MACADDR 0x00e0deadbeef #endif -#ifndef CONFIG_NET -# undef CONFIG_NSH_ARCHMAC -#endif - #if !defined(CONFIG_NSH_NETINIT_THREAD) || !defined(CONFIG_ARCH_PHY_INTERRUPT) || \ !defined(CONFIG_NETDEV_PHY_IOCTL) || !defined(CONFIG_NET_UDP) || \ defined(CONFIG_DISABLE_SIGNALS) @@ -772,14 +768,9 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl); /* Architecture-specific initialization */ -#ifdef CONFIG_NSH_ARCHINIT -int board_app_initialize(void); -#else -# define board_app_initialize() (-ENOSYS) -#endif - -#ifdef CONFIG_NSH_ARCHMAC -int nsh_arch_macaddress(uint8_t *mac); +#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_LIB_BOARDCTL) +# warning CONFIG_NSH_ARCHINIT is set, but CONFIG_LIB_BOARDCTL is not +# undef CONFIG_NSH_ARCHINIT #endif /* Basic session and message handling */ |