diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 18:31:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 18:31:26 +0000 |
| commit | 529a1cf7339541eaee3d189a3b97d9c544ba7810 (patch) | |
| tree | 2ef2e0911d89b06813b81aa21360cf2e20e24ca3 /nuttx/examples | |
| parent | 5029575d531576c6818094334dcae95359bdd119 (diff) | |
| download | nuttx-529a1cf7339541eaee3d189a3b97d9c544ba7810.tar.gz nuttx-529a1cf7339541eaee3d189a3b97d9c544ba7810.tar.bz2 nuttx-529a1cf7339541eaee3d189a3b97d9c544ba7810.zip | |
apps/ update from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3392 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples')
| -rw-r--r-- | nuttx/examples/nsh/nsh.h | 10 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_apps.c | 2 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/nuttx/examples/nsh/nsh.h b/nuttx/examples/nsh/nsh.h index a6824f1b7..ea05da31b 100644 --- a/nuttx/examples/nsh/nsh.h +++ b/nuttx/examples/nsh/nsh.h @@ -333,16 +333,6 @@ extern int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, FAR char *argv[]); #endif -/* I/O interfaces */ - -#ifdef CONFIG_EXAMPLES_NSH_CONSOLE -extern int nsh_consolemain(int argc, char *argv[]); -#endif - -#ifdef CONFIG_EXAMPLES_NSH_TELNET -extern int nsh_telnetmain(int argc, char *argv[]); -#endif - /* Working directory support */ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) diff --git a/nuttx/examples/nsh/nsh_apps.c b/nuttx/examples/nsh/nsh_apps.c index d1ce1d955..58f44414a 100644 --- a/nuttx/examples/nsh/nsh_apps.c +++ b/nuttx/examples/nsh/nsh_apps.c @@ -47,7 +47,7 @@ #include <stdbool.h> #include <errno.h> -#include <nuttx/nuttapp.h> +#include <apps/apps.h> #include "nsh.h" diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index 85b84d4b2..2544baf5b 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -57,8 +57,9 @@ #endif #ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS -# include <nuttx/nuttapp.h> +# include <apps/apps.h> #endif +#include <apps/nsh.h> #include "nsh.h" |