NSH now uses the new Telnet daemon and built-in tasks started by NSH can be used over Telnet

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4361 7fd9a85b-ad96-42d3-883c-3090e2eb8679

apps/examples/nsh/nsh_main.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/nsh/nsh_main.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -81,56 +81,42 @@
 
 int user_start(int argc, char *argv[])
 {
-  int mid_priority;
+  int exitval = 0;
-#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
   int ret;
-#endif
 
   /* Initialize the NSH library */
 
   nsh_initialize();
 
-  /* Set the priority of this task to something in the middle so that 'nice'
+  /* If the Telnet console is selected as a front-end, then start the
-   * can both raise and lower the priority.
+   * Telnet daemon.
    */
 
-  mid_priority = (sched_get_priority_max(SCHED_NSH) + sched_get_priority_min(SCHED_NSH)) >> 1;
+#ifdef CONFIG_NSH_TELNET
-    {
+  ret = nsh_telnetstart();
-      struct sched_param param;
-
-      param.sched_priority = mid_priority;
-      (void)sched_setscheduler(0, SCHED_NSH, &param);
-    }
-
-  /* If both the console and telnet are selected as front-ends, then run
-   * the telnet front end on another thread.
-   */
-
-#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
-# ifndef CONFIG_CUSTOM_STACK
-  ret = task_create("nsh_telnetmain", mid_priority, CONFIG_NSH_STACKSIZE,
-                    nsh_telnetmain, NULL);
-# else
-  ret = task_create("nsh_telnetmain", mid_priority, nsh_telnetmain, NULL);
-# endif
   if (ret < 0)
-   {
+    {
      /* 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);
+     fprintf(stderr, "ERROR: Failed to start TELNET daemon: %d\n", ret);
+     exitval = 1;
    }
-
-  /* If only the telnet front-end is selected, run it on this thread */
-
-#elif defined(CONFIG_NSH_TELNET)
-  return nsh_telnetmain(0, NULL);
 #endif
 
-/* If the serial console front end is selected, then run it on this thread */
+  /* If the serial console front end is selected, then run it on this thread */
 
 #ifdef CONFIG_NSH_CONSOLE
-  return nsh_consolemain(0, NULL);
+  ret = nsh_consolemain(0, NULL);
+
+  /* nsh_consolemain() should not return.  So if we get here, something
+   * is wrong.
+   */
+
+  fprintf(stderr, "ERROR: nsh_consolemain() returned: %d\n", ret);
+  exitval = 1;
 #endif
+
+  return exitval;
 }

apps/examples/telnetd/shell.h

@@ -91,7 +91,6 @@
 #  define MAIN_STRING "user_start: "
 #endif
 
-
 /* Other definitions ********************************************************/
 
 #define SHELL_PROMPT "uIP 1.0> "

apps/include/nsh.h

@@ -67,27 +67,51 @@ extern "C" {
  * Public Function Prototypes
  ****************************************************************************/
 
-/* Interfaces needed to initialize and execute the NuttShell (NSH).
+/****************************************************************************
+ * Name: nsh_initialize
  *
- * nsh_initialize() - This function function should be called one during
+ * Description:
- *   application start-up prior to executing nsh_consolemain() or
+ *   This nterfaces is used to initialize the NuttShell (NSH).
- *   nsh_telnetmain().
+ *   nsh_initialize() should be called one during application start-up prior
- */
+ *   to executing either nsh_consolemain() or nsh_telnetstart().
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
 
 EXTERN void nsh_initialize(void);
 
-/* The following interfaces maybe to called or started with task_start to
+/****************************************************************************
- * start an NSH instance.
+ * Name: nsh_consolemain
  *
- * nsh_consolemain() starts NSH on the console (/dev/console).
+ * Description:
- * nsh_telnetmain() starts a telnet daemon that will allow multiple
+ *   This interfaces maybe to called or started with task_start to start a
- *   connections via telnet.
+ *   single an NSH instance that operates on stdin and stdout (/dev/console).
+ *   This function does not return.
  *
- * These functions do not return.
+ * Input Parameters:
- */
+ *   Standard task start-up arguements.  These are not used.  argc may be
+ *   zero and argv may be NULL.
+ *
+ * Returned Values:
+ *   This function does not normally return.  exit() is usually called to
+ *   terminate the NSH session.  This function will return in the event of
+ *   an error.  In that case, a nonzero value is returned (1).
+ *  
+ ****************************************************************************/
 
 EXTERN int nsh_consolemain(int argc, char *argv[]);
-EXTERN int nsh_telnetmain(int argc, char *argv[]);
+
+/* nsh_telnetstart() starts a telnet daemon that will allow multiple
+ * NSH connections via telnet.  This function returns immediately after
+ * the daemon has been started.
+ */
+
+EXTERN int nsh_telnetstart(void);
 
 #undef EXTERN
 #ifdef __cplusplus

apps/nshlib/Makefile

@@ -1,8 +1,8 @@
 ############################################################################
 # apps/nshlib/Makefile
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,8 +40,8 @@ include $(APPDIR)/Make.defs
 # NSH Library
 
 ASRCS	=
-CSRCS	= nsh_parse.c nsh_fscmds.c nsh_ddcmd.c nsh_proccmds.c nsh_mmcmds.c \
+CSRCS	= nsh_parse.c nsh_console.c nsh_fscmds.c nsh_ddcmd.c nsh_proccmds.c \
-		nsh_envcmds.c nsh_dbgcmds.c
+		nsh_mmcmds.c nsh_envcmds.c nsh_dbgcmds.c
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CSRCS	+= nsh_apps.c
@@ -60,7 +60,7 @@ CSRCS	+= nsh_timcmds.c
 endif
 
 ifeq ($(CONFIG_NSH_CONSOLE),y)
-CSRCS	+= nsh_serial.c
+CSRCS	+= nsh_consolemain.c
 endif
 
 ifeq ($(CONFIG_NSH_TELNET),y)

apps/nshlib/README.txt

@@ -870,11 +870,6 @@ NSH-Specific Configuration Settings
       The maximum length of one command line and of one output line.
       Default: 80
 
-  * CONFIG_NSH_STACKSIZE
-      The stack size to use when spawning new threads or tasks.  Such
-      new threads are generated when a command is executed in background
-      or as new TELNET connections are established.
-
   * CONFIG_NSH_NESTDEPTH
       The maximum number of nested if-then[-else]-fi sequences that
       are permissable.  Default: 3
@@ -936,6 +931,24 @@ NSH-Specific Configuration Settings
       function will be called early in NSH initialization to allow
       board logic to do such things as configure MMC/SD slots.
 
+  If Telnet is selected for the NSH console, then we must configure
+  the resources used by the Telnet daemon and by the Telnet clients.
+
+  * CONFIG_NSH_TELNETD_PORT - The telnet daemon will listen on this
+      TCP port number for connections.  Default: 23
+
+  * CONFIG_NSH_TELNETD_DAEMONPRIO - Priority of the Telnet daemon.
+      Default: SCHED_PRIORITY_DEFAULT
+
+  * CONFIG_NSH_TELNETD_DAEMONSTACKSIZE - Stack size allocated for the
+      Telnet daemon. Default: 2048
+
+  * CONFIG_NSH_TELNETD_CLIENTPRIO- Priority of the Telnet client.
+      Default: SCHED_PRIORITY_DEFAULT
+
+  * CONFIG_NSH_TELNETD_CLIENTSTACKSIZE - Stack size allocated for the
+      Telnet client. Default: 2048
+
   One or both of CONFIG_NSH_CONSOLE and CONFIG_NSH_TELNET
   must be defined.  If CONFIG_NSH_TELNET is selected, then there some
   other configuration settings that apply:

apps/nshlib/nsh.h

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh.h
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,22 +43,19 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
+
+#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
 
-#ifdef CONFIG_NSH_CONSOLE
-# include <stdio.h>
-#endif
-
 /****************************************************************************
  * Definitions
  ****************************************************************************/
-
+/* Configuration ************************************************************/
-/* The telnetd interface and background commands require pthread support */
+/* The background commands require pthread support */
 
 #ifdef CONFIG_DISABLE_PTHREAD
-#  undef CONFIG_NSH_TELNET
 #  ifndef CONFIG_NSH_DISABLEBG
 #    define CONFIG_NSH_DISABLEBG 1
 #  endif
@@ -89,6 +86,41 @@
 #  endif
 #endif
 
+/* If Telnet is selected for the NSH console, then we must configure
+ * the resources used by the Telnet daemon and by the Telnet clients.
+ *
+ * CONFIG_NSH_TELNETD_PORT - The telnet daemon will listen on this.
+ *   port.  Default: 23
+ * CONFIG_NSH_TELNETD_DAEMONPRIO - Priority of the Telnet daemon.
+ *   Default: SCHED_PRIORITY_DEFAULT
+ * CONFIG_NSH_TELNETD_DAEMONSTACKSIZE - Stack size allocated for the
+ *   Telnet daemon. Default: 2048
+ * CONFIG_NSH_TELNETD_CLIENTPRIO- Priority of the Telnet client.
+ *   Default: SCHED_PRIORITY_DEFAULT
+ * CONFIG_NSH_TELNETD_CLIENTSTACKSIZE - Stack size allocated for the
+ *   Telnet client. Default: 2048
+ */
+
+#ifndef CONFIG_NSH_TELNETD_PORT
+#  define CONFIG_NSH_TELNETD_PORT 23
+#endif
+
+#ifndef CONFIG_NSH_TELNETD_DAEMONPRIO
+#  define CONFIG_NSH_TELNETD_DAEMONPRIO SCHED_PRIORITY_DEFAULT
+#endif
+
+#ifndef CONFIG_NSH_TELNETD_DAEMONSTACKSIZE
+#  define CONFIG_NSH_TELNETD_DAEMONSTACKSIZE 2048
+#endif
+
+#ifndef CONFIG_NSH_TELNETD_CLIENTPRIO
+#  define CONFIG_NSH_TELNETD_CLIENTPRIO SCHED_PRIORITY_DEFAULT
+#endif
+
+#ifndef CONFIG_NSH_TELNETD_CLIENTSTACKSIZE
+#  define CONFIG_NSH_TELNETD_CLIENTSTACKSIZE 2048
+#endif
+
 /* Verify support for ROMFS /etc directory support options */
 
 #ifdef CONFIG_NSH_ROMFSETC
@@ -160,14 +192,6 @@
 # define CONFIG_NSH_IOBUFFER_SIZE 512
 #endif
 
-/* As threads are created to handle each request, a stack must be allocated
- * for the thread.  Use a default if the user provided no stacksize.
- */
-
-#ifndef CONFIG_NSH_STACKSIZE
-# define CONFIG_NSH_STACKSIZE 4096
-#endif
-
 /* The maximum number of nested if-then[-else]-fi sequences that
  * are permissable.
  */
@@ -187,26 +211,6 @@
 # define CONFIG_LIB_HOMEDIR "/"
 #endif
 
-/* Method access macros */
-
-#define nsh_clone(v)           (v)->clone(v)
-#define nsh_release(v)         (v)->release(v)
-#define nsh_write(v,b,n)       (v)->write(v,b,n)
-#define nsh_linebuffer(v)      (v)->linebuffer(v)
-#define nsh_redirect(v,f,s)    (v)->redirect(v,f,s)
-#define nsh_undirect(v,s)      (v)->undirect(v,s)
-#define nsh_exit(v)            (v)->exit(v)
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
-#else
-# define nsh_output            vtbl->output
-#endif
-
-/* Size of info to be saved in call to nsh_redirect */
-
-#define SAVE_SIZE (sizeof(int) + sizeof(FILE*) + sizeof(bool))
-
 /* Stubs used when working directory is not supported */
 
 #if CONFIG_NFILE_DESCRIPTORS <= 0 || defined(CONFIG_DISABLE_ENVIRON)
@@ -257,31 +261,7 @@ struct nsh_parser_s
 #endif
 };
 
-struct nsh_vtbl_s
+struct nsh_vtbl_s; /* Defined in nsh_console.h */
-{
-  /* This function pointers are "hooks" into the front end logic to
-   * handle things like output of command results, redirection, etc.
-   * -- all of which must be done in a way that is unique to the nature
-   * of the front end.
-   */
-
-#ifndef CONFIG_NSH_DISABLEBG
-  FAR struct nsh_vtbl_s *(*clone)(FAR struct nsh_vtbl_s *vtbl);
-  void (*addref)(FAR struct nsh_vtbl_s *vtbl);
-  void (*release)(FAR struct nsh_vtbl_s *vtbl);
-#endif
-  ssize_t (*write)(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes);
-  int (*output)(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...);
-  FAR char *(*linebuffer)(FAR struct nsh_vtbl_s *vtbl);
-  void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
-  void (*undirect)(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save);
-  void (*exit)(FAR struct nsh_vtbl_s *vtbl);
-
-  /* Parser state data */
-
-  struct nsh_parser_s np;
-};
-
 typedef int (*cmd_t)(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 
 /****************************************************************************

apps/nshlib/nsh_apps.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * apps/nshlib/nsh_apps.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
  *
@@ -51,6 +51,7 @@
 #include <apps/apps.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 #ifdef CONFIG_NSH_BUILTIN_APPS
 
@@ -89,30 +90,30 @@
 int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
                 FAR char **argv)
 {
-   int ret = OK;
+  int ret = OK;
 
-   /* Try to find command within pre-built application list. */
+  /* Try to find command within pre-built application list. */
 
-   ret = exec_namedapp(cmd, (FAR const char **)argv);
+  ret = exec_namedapp(cmd, (FAR const char **)argv);
-   if (ret < 0)
+  if (ret < 0)
-     {
+    {
-       return -errno;
+      return -errno;
-     }
+    }
 
 #ifdef CONFIG_SCHED_WAITPID
-   if (vtbl->np.np_bg == false)
+  if (vtbl->np.np_bg == false)
-     {
+    {
-       waitpid(ret, NULL, 0);
+      waitpid(ret, NULL, 0);
-     }
+    }
-   else
+  else
 #endif
-     {
+    {
-       struct sched_param param;
+      struct sched_param param;
-       sched_getparam(0, &param);
+      sched_getparam(0, &param);
-       nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority);
+      nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority);
-     }
+    }
 
-   return OK;
+  return OK;
 }
 
 #endif /* CONFIG_NSH_BUILTIN_APPS */

apps/nshlib/nsh_consolemain.c

@@ -0,0 +1,163 @@
+/****************************************************************************
+ * apps/nshlib/nsh_consolemain.c
+ *
+ *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <assert.h>
+
+#include <apps/readline.h>
+
+#include "nsh.h"
+#include "nsh_console.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_consolemain
+ *
+ * Description:
+ *   This interfaces maybe to called or started with task_start to start a
+ *   single an NSH instance that operates on stdin and stdout (/dev/console).
+ *   This function does not return.
+ *
+ * Input Parameters:
+ *   Standard task start-up arguements.  These are not used.  argc may be
+ *   zero and argv may be NULL.
+ *
+ * Returned Values:
+ *   This function does not normally return.  exit() is usually called to
+ *   terminate the NSH session.  This function will return in the event of
+ *   an error.  In that case, a nonzero value is returned (1).
+ *  
+ ****************************************************************************/
+
+int nsh_consolemain(int argc, char *argv[])
+{
+  FAR struct console_stdio_s *pstate = nsh_newconsole();
+  DEBUGASSERT(pstate);
+  int ret;
+
+  /* If we are using a USB serial console, then we will have to wait for the
+   * USB to be connected to the host.
+   */
+
+#ifdef HAVE_USB_CONSOLE
+  DEBUGASSERT(nsh_usbconsole() == OK);
+#endif
+
+  /* Present a greeting */
+
+  fputs(g_nshgreeting, pstate->cn_outstream);
+  fflush(pstate->cn_outstream);
+
+  /* Execute the startup script */
+
+#ifdef CONFIG_NSH_ROMFSETC
+  (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH);
+#endif
+
+  /* Then enter the command line parsing loop */
+
+  for (;;)
+    {
+      /* Display the prompt string */
+
+      fputs(g_nshprompt, pstate->cn_outstream);
+      fflush(pstate->cn_outstream);
+
+      /* Get the next line of input */
+
+      ret = readline(pstate->cn_line, CONFIG_NSH_LINELEN,
+                     INSTREAM(pstate), OUTSTREAM(pstate));
+      if (ret > 0)
+        {
+          /* Parse process the command */
+
+          (void)nsh_parse(&pstate->cn_vtbl, pstate->cn_line);
+          fflush(pstate->cn_outstream);
+        }
+
+      /* Readline normally returns the number of characters read,
+       * but will return 0 on end of file or a negative value
+       * if an error occurs.  Either will cause the session to
+       * terminate.
+       */
+
+      else
+        {
+          fprintf(pstate->cn_outstream, g_fmtcmdfailed, "readline", NSH_ERRNO_OF(-ret));
+          nsh_exit(&pstate->cn_vtbl, 1);
+        }
+    }
+
+  /* Clean up */
+
+  nsh_exit(&pstate->cn_vtbl, 0);
+
+  /* We do not get here, but this is necessary to keep some compilers happy */
+
+  return OK;
+}

apps/nshlib/nsh_dbgcmds.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/dbg_dbgcmds.c
  *
- *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,6 +47,7 @@
 #include <errno.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions
@@ -151,36 +152,36 @@ int cmd_mb(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       /* Loop for the number of requested bytes */
 
       for (i = 0, ptr = (volatile uint8_t*)mem.dm_addr; i < mem.dm_count; i++, ptr++)
-	{
+        {
-	  /* Print the value at the address */
+          /* Print the value at the address */
 
-	  nsh_output(vtbl, "  %p = 0x%02x", ptr, *ptr);
+          nsh_output(vtbl, "  %p = 0x%02x", ptr, *ptr);
 
-	  /* Are we supposed to write a value to this address? */
+          /* Are we supposed to write a value to this address? */
 
-	  if (mem.dm_write)
+          if (mem.dm_write)
-	    {
+            {
-	      /* Yes, was the supplied value within range? */
+              /* Yes, was the supplied value within range? */
 
-	      if (mem.dm_value > 0x000000ff)
+              if (mem.dm_value > 0x000000ff)
-		{
+                {
-		  nsh_output(vtbl, g_fmtargrange, argv[0]);
+                  nsh_output(vtbl, g_fmtargrange, argv[0]);
-		  return ERROR;
+                  return ERROR;
-		}
+                }
 
-	      /* Write the value and re-read the address so that we print its
+              /* Write the value and re-read the address so that we print its
-	       * current value (if the address is a process address, then the
+               * current value (if the address is a process address, then the
-	       * value read might not necessarily be the value written).
+               * value read might not necessarily be the value written).
-	       */
+               */
 
-	      *ptr = (uint8_t)mem.dm_value;
+              *ptr = (uint8_t)mem.dm_value;
-	      nsh_output(vtbl, " -> 0x%02x", *ptr);
+              nsh_output(vtbl, " -> 0x%02x", *ptr);
-	    }
+            }
 
-	  /* Make sure we end it with a newline */
+          /* Make sure we end it with a newline */
 
-	  nsh_output(vtbl, "\n", *ptr);
+          nsh_output(vtbl, "\n", *ptr);
-	}
+        }
     }
   return ret;
 }
@@ -204,36 +205,36 @@ int cmd_mh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       /* Loop for the number of requested bytes */
 
       for (i = 0, ptr = (volatile uint16_t*)mem.dm_addr; i < mem.dm_count; i += 2, ptr++)
-	{
+        {
-	  /* Print the value at the address */
+          /* Print the value at the address */
 
-	  nsh_output(vtbl, "  %p = 0x%04x", ptr, *ptr);
+          nsh_output(vtbl, "  %p = 0x%04x", ptr, *ptr);
 
-	  /* Are we supposed to write a value to this address? */
+          /* Are we supposed to write a value to this address? */
 
-	  if (mem.dm_write)
+          if (mem.dm_write)
-	    {
+            {
-	      /* Yes, was the supplied value within range? */
+              /* Yes, was the supplied value within range? */
 
-	      if (mem.dm_value > 0x0000ffff)
+              if (mem.dm_value > 0x0000ffff)
-		{
+                {
-		  nsh_output(vtbl, g_fmtargrange, argv[0]);
+                  nsh_output(vtbl, g_fmtargrange, argv[0]);
-		  return ERROR;
+                  return ERROR;
-		}
+                }
 
-	      /* Write the value and re-read the address so that we print its
+              /* Write the value and re-read the address so that we print its
-	       * current value (if the address is a process address, then the
+               * current value (if the address is a process address, then the
-	       * value read might not necessarily be the value written).
+               * value read might not necessarily be the value written).
-	       */
+               */
 
-	      *ptr = (uint16_t)mem.dm_value;
+              *ptr = (uint16_t)mem.dm_value;
-	      nsh_output(vtbl, " -> 0x%04x", *ptr);
+              nsh_output(vtbl, " -> 0x%04x", *ptr);
-	    }
+            }
 
-	  /* Make sure we end it with a newline */
+          /* Make sure we end it with a newline */
 
-	  nsh_output(vtbl, "\n", *ptr);
+          nsh_output(vtbl, "\n", *ptr);
-	}
+        }
     }
   return ret;
 }
@@ -257,28 +258,28 @@ int cmd_mw(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       /* Loop for the number of requested bytes */
 
       for (i = 0, ptr = (volatile uint32_t*)mem.dm_addr; i < mem.dm_count; i += 4, ptr++)
-	{
+        {
-	  /* Print the value at the address */
+          /* Print the value at the address */
 
-	  nsh_output(vtbl, "  %p = 0x%08x", ptr, *ptr);
+          nsh_output(vtbl, "  %p = 0x%08x", ptr, *ptr);
 
-	  /* Are we supposed to write a value to this address? */
+          /* Are we supposed to write a value to this address? */
 
-	  if (mem.dm_write)
+          if (mem.dm_write)
-	    {
+            {
-	      /* Write the value and re-read the address so that we print its
+              /* Write the value and re-read the address so that we print its
-	       * current value (if the address is a process address, then the
+               * current value (if the address is a process address, then the
-	       * value read might not necessarily be the value written).
+               * value read might not necessarily be the value written).
-	       */
+               */
 
-	      *ptr = mem.dm_value;
+              *ptr = mem.dm_value;
-	      nsh_output(vtbl, " -> 0x%08x", *ptr);
+              nsh_output(vtbl, " -> 0x%08x", *ptr);
-	    }
+            }
 
-	  /* Make sure we end it with a newline */
+          /* Make sure we end it with a newline */
 
-	  nsh_output(vtbl, "\n", *ptr);
+          nsh_output(vtbl, "\n", *ptr);
-	}
+        }
     }
   return ret;
 }

apps/nshlib/nsh_ddcmd.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_ddcmd.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -51,7 +52,9 @@
 #include <errno.h>
 
 #include <nuttx/fs.h>
+
 #include "nsh.h"
+#include "nsh_console.h"
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_NSH_DISABLE_DD)
 

apps/nshlib/nsh_envcmds.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_envcmds.c
  *
- *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,6 +47,7 @@
 #include <errno.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/nshlib/nsh_fscmds.c

@@ -68,6 +68,7 @@
 #include <debug.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/nshlib/nsh_mmcmds.c

@@ -42,6 +42,7 @@
 #include <stdlib.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/nshlib/nsh_netcmds.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_netcmds.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -81,6 +81,7 @@
 #endif
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/nshlib/nsh_netinit.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_netinit.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * This is influenced by similar logic from uIP:
  *

apps/nshlib/nsh_parse.c

@@ -64,6 +64,7 @@
 #include <apps/nsh.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions
@@ -463,7 +464,7 @@ static int cmd_unrecognized(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #ifndef CONFIG_NSH_DISABLE_EXIT
 static int cmd_exit(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
-  nsh_exit(vtbl);
+  nsh_exit(vtbl, 0);
   return OK;
 }
 #endif
@@ -1018,6 +1019,18 @@ static inline int nsh_nice(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd, FAR ch
 
 /****************************************************************************
  * Name: nsh_initialize
+ *
+ * Description:
+ *   This nterfaces is used to initialize the NuttShell (NSH).
+ *   nsh_initialize() should be called one during application start-up prior
+ *   to executing either nsh_consolemain() or nsh_telnetstart().
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
  ****************************************************************************/
 
 void nsh_initialize(void)
@@ -1037,6 +1050,10 @@ void nsh_initialize(void)
 
 /****************************************************************************
  * Name: nsh_parse
+ *
+ * Description:
+ *   This function parses and executes one NSH command.
+ *
  ****************************************************************************/
 
 int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)

apps/nshlib/nsh_proccmds.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_proccmds.c
  *
- *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,6 +46,7 @@
 #include <errno.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/nshlib/nsh_romfsetc.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_romfsetc.c
  *
- *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

apps/nshlib/nsh_test.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/nsh_test.c
  *
- *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -69,6 +69,7 @@
 #include <string.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST)
 

apps/nshlib/nsh_timcmds.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/nshlib/dbg_timcmds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,6 +45,7 @@
 #include <time.h>
 
 #include "nsh.h"
+#include "nsh_console.h"
 
 /****************************************************************************
  * Definitions

apps/system/free/Makefile

@@ -61,7 +61,11 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(WINTOOL),y)
+  BIN		= "${shell cygpath -w  $(APPDIR)/libapps$(LIBEXT)}"
+else
+  BIN		= "$(APPDIR)/libapps$(LIBEXT)"
+endif
 
 ROOTDEPPATH	= --dep-path .
 

apps/system/i2c/Makefile

@@ -1,8 +1,8 @@
 ############################################################################
 # apps/system/i2c
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -42,7 +42,6 @@ include $(APPDIR)/Make.defs
 ASRCS	=
 CSRCS	= i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_main.c i2c_set.c i2c_verf.c
 
-
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 

apps/system/readline/Makefile

@@ -52,7 +52,11 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(WINTOOL),y)
+  BIN		= "${shell cygpath -w  $(APPDIR)/libapps$(LIBEXT)}"
+else
+  BIN		= "$(APPDIR)/libapps$(LIBEXT)"
+endif
 
 ROOTDEPPATH	= --dep-path .
 

nuttx/Documentation/NuttShell.html

@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
-      <p>Last Updated: September 1, 2011</p>
+      <p>Last Updated: February 2, 2012</p>
     </td>
   </tr>
 </table>
@@ -2131,13 +2131,6 @@ nsh>
       Default: 80
     </td>
   </tr>
-  <tr>
-    <td valign="top"><b><code>CONFIG_NSH_STACKSIZE</code></b></td>
-    <td>
-      The stack size to use when spawning new threads or tasks.  Such
-      new threads are generated when a command is executed in background
-      or as new TELNET connections are established.
-    </td>
   </tr>
   <tr>
     <td valign="top"><b><code>CONFIG_NSH_NESTDEPTH</code></b></td>
@@ -2227,6 +2220,52 @@ nsh>
   </tr>
 </table></center>
 
+<p>
+  If Telnet is selected for the NSH console, then we must configure
+  the resources used by the Telnet daemon and by the Telnet clients.
+</p>
+
+<center><table width="100%">
+  <tr bgcolor="#e4e4e4">
+    <th align="left" width="25%">Configuration</th>
+    <th align="left">Description</th>
+  </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_NSH_TELNETD_PORT</code></b></td>
+    <td>
+      The telnet daemon will listen on this TCP port number for connections.  Default: 23
+    </td>
+  </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_NSH_TELNETD_DAEMONPRIO</code></b></td>
+    <td>
+      Priority of the Telnet daemon.
+      Default: <code>SCHED_PRIORITY_DEFAULT</code>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_NSH_TELNETD_DAEMONSTACKSIZE</code></b></td>
+    <td>
+      Stack size allocated for the
+      Telnet daemon. Default: 2048
+    </td>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_NSH_TELNETD_CLIENTPRIO</code></b></td>
+    <td>
+      Priority of the Telnet client.
+      Default: <code>SCHED_PRIORITY_DEFAULT</code>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_NSH_TELNETD_CLIENTSTACKSIZE</code></b></td>
+    <td>
+      Stack size allocated for the Telnet client. Default: 2048
+    </td>
+  </tr>
+</table></center>
+
 <p>
   One or both of <code>CONFIG_NSH_CONSOLE</code> and <code>CONFIG_NSH_TELNET</code>
   must be defined.  If <code>CONFIG_NSH_TELNET</code> is selected, then there some
@@ -2457,7 +2496,6 @@ nsh>
   <li><a href="#nshconfiguration"><code>CONFIG_NSH_ARCHROMFS</code></a></li>
   <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSMOUNTPT</code></a></li>
   <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSSECTSIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_NSH_STACKSIZE</code></a></li>
   <li><a href="#nshconfiguration"><code>CONFIG_NSH_STRERROR</code></a></li>
   <li><a href="#nshconfiguration"><code>CONFIG_NSH_TELNET</code></a></li>
   <li><a href="#configuration">Configuration settings</a></li>

nuttx/configs/amber/hello/defconfig

@@ -658,7 +658,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -689,7 +688,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/avr32dev1/nsh/defconfig

@@ -672,7 +672,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -703,7 +702,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/avr32dev1/ostest/defconfig

@@ -672,7 +672,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -703,7 +702,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/c5471evm/httpd/defconfig

@@ -401,7 +401,6 @@ CONFIG_NSH_CONSOLE=y
 CONFIG_NSH_TELNET=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_CMD_SIZE=40
-CONFIG_NSH_STACKSIZE=4096
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=n
 CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)

nuttx/configs/c5471evm/nettest/defconfig

@@ -401,7 +401,6 @@ CONFIG_NSH_CONSOLE=y
 CONFIG_NSH_TELNET=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_CMD_SIZE=40
-CONFIG_NSH_STACKSIZE=4096
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
 CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)

nuttx/configs/c5471evm/nsh/appconfig

@@ -50,6 +50,9 @@ CONFIGURED_APPS += netutils/dhcpc
 CONFIGURED_APPS += netutils/resolv
 CONFIGURED_APPS += netutils/tftpc
 CONFIGURED_APPS += netutils/webclient
+ifeq ($(CONFIG_NSH_TELNET),y)
+CONFIGURED_APPS += netutils/telnetd
+endif
 endif
 
 

nuttx/configs/c5471evm/nsh/defconfig

@@ -401,7 +401,6 @@ CONFIG_NSH_CONSOLE=n
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_CMD_SIZE=40
-CONFIG_NSH_STACKSIZE=4096
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
 CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)

nuttx/configs/c5471evm/ostest/defconfig

@@ -401,7 +401,6 @@ CONFIG_NSH_CONSOLE=y
 CONFIG_NSH_TELNET=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_CMD_SIZE=40
-CONFIG_NSH_STACKSIZE=4096
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
 CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)

nuttx/configs/demo9s12ne64/ostest/defconfig

@@ -648,7 +648,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -679,7 +678,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=512
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3131/nsh/defconfig

@@ -656,7 +656,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -687,7 +686,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3131/ostest/defconfig

@@ -656,7 +656,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -687,7 +686,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3131/pgnsh/defconfig

@@ -807,7 +807,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -838,7 +837,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3131/usbserial/defconfig

@@ -659,7 +659,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -690,7 +689,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3131/usbstorage/defconfig

@@ -659,7 +659,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -690,7 +689,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ea3152/ostest/defconfig

@@ -657,7 +657,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -688,7 +687,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/httpd/defconfig

@@ -522,7 +522,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -553,7 +552,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/nettest/defconfig

@@ -513,7 +513,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -544,7 +543,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/nsh/defconfig

@@ -498,7 +498,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -529,7 +528,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/nxflat/defconfig

@@ -511,7 +511,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -542,7 +541,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/ostest/defconfig

@@ -505,7 +505,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -536,7 +535,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/eagle100/thttpd/defconfig

@@ -609,7 +609,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -640,7 +639,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=2048
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ez80f910200kitg/ostest/defconfig

@@ -640,7 +640,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -668,7 +667,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ez80f910200zco/dhcpd/defconfig

@@ -667,7 +667,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -695,7 +694,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n

nuttx/configs/ez80f910200zco/httpd/defconfig

@@ -675,7 +675,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -703,7 +702,6 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
-CONFIG_NSH_STACKSIZE=1024
 CONFIG_NSH_NESTDEPTH=3
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n