diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-19 17:29:36 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-19 17:29:36 +0000 |
| commit | 7267882ebd0a6aa79cf88b7f42675804eaff1bcf (patch) | |
| tree | 17febedd8989519aa07453bf731fb4c0ab20e347 | |
| parent | 91d77b455375c2cb410ae981646f398de40175fc (diff) | |
| download | px4-nuttx-7267882ebd0a6aa79cf88b7f42675804eaff1bcf.tar.gz px4-nuttx-7267882ebd0a6aa79cf88b7f42675804eaff1bcf.tar.bz2 px4-nuttx-7267882ebd0a6aa79cf88b7f42675804eaff1bcf.zip | |
Additional changes for clean NSH build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3400 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | apps/nshlib/nsh_netcmds.c | 10 | ||||
| -rw-r--r-- | apps/nshlib/nsh_netinit.c | 7 | ||||
| -rw-r--r-- | apps/nshlib/nsh_telnetd.c | 6 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 8 |
4 files changed, 19 insertions, 12 deletions
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 507742f56..1bd1e93e4 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -65,18 +65,18 @@ #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) -# include <net/uip/uip-lib.h> +# include <apps/netutils/uiplib.h> #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -# include <net/uip/uip-lib.h> -# include <net/uip/tftp.h> +# include <apps/netutils/uiplib.h> +# include <apps/netutils/tftp.h> #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 # ifndef CONFIG_NSH_DISABLE_WGET -# include <net/uip/uip-lib.h> -# include <net/uip/webclient.h> +# include <apps/netutils/uiplib.h> +# include <apps/netutils/webclient.h> # endif #endif diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index f49c64e40..245d50380 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -45,10 +45,11 @@ #include <debug.h> #include <net/if.h> -#include <net/uip/uip-lib.h> + +#include <apps/netutils/uiplib.h> #if defined(CONFIG_NSH_DHCPC) -# include <net/uip/resolv.h> -# include <net/uip/dhcpc.h> +# include <apps/netutils/resolv.h> +# include <apps/netutils/dhcpc.h> #endif #include "nsh.h" diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c index 4f571f44a..0670c9a05 100644 --- a/apps/nshlib/nsh_telnetd.c +++ b/apps/nshlib/nsh_telnetd.c @@ -58,10 +58,10 @@ #include <debug.h> #include <net/if.h> -#include <net/uip/uip-lib.h> +#include <apps/netutils/uiplib.h> #if defined(CONFIG_NSH_DHCPC) -# include <net/uip/resolv.h> -# include <net/uip/dhcpc.h> +# include <apps/netutils/resolv.h> +# include <apps/netutils/dhcpc.h> #endif #include "nsh.h" diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index c973530cc..6f63308b4 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -41,7 +41,9 @@ #include <sys/stat.h> #include <stdint.h> +#include <stdio.h> #include <sched.h> +#include <errno.h> #include <apps/nsh.h> @@ -134,7 +136,11 @@ int user_start(int argc, char *argv[]) # endif if (ret < 0) { - fprintf(stderr, g_fmtcmdfailed, "user_start", "task_create", NSH_ERRNO); + /* The daemon is NOT running. Report the the error then fail... + * either with the serial console up or just exiting. + */ + + fprintf(stderr, "ERROR: Failed to start TELNET daemon: %d\n", errno); } /* If only the telnet front-end is selected, run it on this thread */ |