From 7a586daed8a1ae7de992a35dac2e1b835ae746be Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 2 Feb 2012 16:04:09 +0000 Subject: [PATCH] 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 | 56 +- apps/examples/telnetd/shell.h | 1 - apps/include/nsh.h | 50 +- apps/nshlib/Makefile | 10 +- apps/nshlib/README.txt | 23 +- apps/nshlib/nsh.h | 104 +- apps/nshlib/nsh_apps.c | 39 +- apps/nshlib/nsh_consolemain.c | 163 ++++ apps/nshlib/nsh_dbgcmds.c | 125 +-- apps/nshlib/nsh_ddcmd.c | 7 +- apps/nshlib/nsh_envcmds.c | 5 +- apps/nshlib/nsh_fscmds.c | 1 + apps/nshlib/nsh_mmcmds.c | 1 + apps/nshlib/nsh_netcmds.c | 5 +- apps/nshlib/nsh_netinit.c | 4 +- apps/nshlib/nsh_parse.c | 19 +- apps/nshlib/nsh_proccmds.c | 5 +- apps/nshlib/nsh_romfsetc.c | 4 +- apps/nshlib/nsh_serial.c | 534 ---------- apps/nshlib/nsh_telnetd.c | 915 +++--------------- apps/nshlib/nsh_test.c | 5 +- apps/nshlib/nsh_timcmds.c | 5 +- apps/nshlib/nsh_usbdev.c | 2 +- apps/system/free/Makefile | 6 +- apps/system/i2c/Makefile | 5 +- apps/system/readline/Makefile | 6 +- nuttx/Documentation/NuttShell.html | 56 +- nuttx/configs/amber/hello/defconfig | 2 - nuttx/configs/avr32dev1/nsh/defconfig | 2 - nuttx/configs/avr32dev1/ostest/defconfig | 2 - nuttx/configs/c5471evm/httpd/defconfig | 1 - nuttx/configs/c5471evm/nettest/defconfig | 1 - nuttx/configs/c5471evm/nsh/appconfig | 3 + nuttx/configs/c5471evm/nsh/defconfig | 1 - nuttx/configs/c5471evm/ostest/defconfig | 1 - nuttx/configs/demo9s12ne64/ostest/defconfig | 2 - nuttx/configs/ea3131/nsh/defconfig | 2 - nuttx/configs/ea3131/ostest/defconfig | 2 - nuttx/configs/ea3131/pgnsh/defconfig | 2 - nuttx/configs/ea3131/usbserial/defconfig | 2 - nuttx/configs/ea3131/usbstorage/defconfig | 2 - nuttx/configs/ea3152/ostest/defconfig | 2 - nuttx/configs/eagle100/httpd/defconfig | 2 - nuttx/configs/eagle100/nettest/defconfig | 2 - nuttx/configs/eagle100/nsh/defconfig | 2 - nuttx/configs/eagle100/nxflat/defconfig | 2 - nuttx/configs/eagle100/ostest/defconfig | 2 - nuttx/configs/eagle100/thttpd/defconfig | 2 - .../configs/ez80f910200kitg/ostest/defconfig | 2 - nuttx/configs/ez80f910200zco/dhcpd/defconfig | 2 - nuttx/configs/ez80f910200zco/httpd/defconfig | 2 - .../configs/ez80f910200zco/nettest/defconfig | 2 - nuttx/configs/ez80f910200zco/nsh/defconfig | 2 - nuttx/configs/ez80f910200zco/ostest/defconfig | 2 - nuttx/configs/ez80f910200zco/poll/defconfig | 2 - nuttx/configs/hymini-stm32v/buttons/defconfig | 2 - nuttx/configs/hymini-stm32v/nsh/defconfig | 2 - nuttx/configs/hymini-stm32v/nsh2/defconfig | 2 - nuttx/configs/hymini-stm32v/nx/defconfig | 2 - nuttx/configs/hymini-stm32v/nxlines/defconfig | 2 - .../configs/hymini-stm32v/usbserial/defconfig | 2 - .../hymini-stm32v/usbstorage/defconfig | 2 - nuttx/configs/kwikstik-k40/ostest/defconfig | 2 - nuttx/configs/lm3s6432-s2e/nsh/appconfig | 3 + nuttx/configs/lm3s6432-s2e/nsh/defconfig | 2 - nuttx/configs/lm3s6432-s2e/ostest/defconfig | 2 - nuttx/configs/lm3s6965-ek/nsh/appconfig | 3 + nuttx/configs/lm3s6965-ek/nsh/defconfig | 2 - nuttx/configs/lm3s6965-ek/nx/defconfig | 2 - nuttx/configs/lm3s6965-ek/ostest/defconfig | 2 - nuttx/configs/lm3s8962-ek/nsh/appconfig | 3 + nuttx/configs/lm3s8962-ek/nsh/defconfig | 2 - nuttx/configs/lm3s8962-ek/nx/defconfig | 2 - nuttx/configs/lm3s8962-ek/ostest/defconfig | 2 - .../lpcxpresso-lpc1768/dhcpd/defconfig | 2 - .../configs/lpcxpresso-lpc1768/nsh/appconfig | 3 + .../configs/lpcxpresso-lpc1768/nsh/defconfig | 2 - nuttx/configs/lpcxpresso-lpc1768/nx/defconfig | 2 - .../lpcxpresso-lpc1768/ostest/defconfig | 2 - .../lpcxpresso-lpc1768/thttpd/defconfig | 2 - .../lpcxpresso-lpc1768/usbstorage/defconfig | 2 - nuttx/configs/m68332evb/defconfig | 1 - nuttx/configs/mbed/hidkbd/defconfig | 2 - nuttx/configs/mbed/nsh/defconfig | 2 - .../mcu123-lpc214x/composite/defconfig | 2 - nuttx/configs/mcu123-lpc214x/nsh/defconfig | 2 - nuttx/configs/mcu123-lpc214x/ostest/defconfig | 2 - .../mcu123-lpc214x/usbserial/defconfig | 2 - .../mcu123-lpc214x/usbstorage/defconfig | 2 - nuttx/configs/micropendous3/hello/defconfig | 2 - nuttx/configs/mx1ads/ostest/defconfig | 1 - nuttx/configs/ne64badge/ostest/defconfig | 2 - nuttx/configs/ntosd-dm320/nettest/defconfig | 1 - nuttx/configs/ntosd-dm320/nsh/appconfig | 3 + nuttx/configs/ntosd-dm320/nsh/defconfig | 2 - nuttx/configs/ntosd-dm320/ostest/defconfig | 1 - nuttx/configs/ntosd-dm320/poll/defconfig | 1 - nuttx/configs/ntosd-dm320/thttpd/defconfig | 3 - nuttx/configs/ntosd-dm320/udp/defconfig | 1 - nuttx/configs/ntosd-dm320/uip/defconfig | 1 - nuttx/configs/nucleus2g/nsh/defconfig | 2 - nuttx/configs/nucleus2g/ostest/defconfig | 2 - nuttx/configs/nucleus2g/usbserial/defconfig | 2 - nuttx/configs/nucleus2g/usbstorage/defconfig | 2 - .../configs/olimex-lpc1766stk/ftpc/appconfig | 5 + .../configs/olimex-lpc1766stk/ftpc/defconfig | 2 - .../olimex-lpc1766stk/hidkbd/defconfig | 2 - .../olimex-lpc1766stk/nettest/defconfig | 2 - nuttx/configs/olimex-lpc1766stk/nsh/appconfig | 3 + nuttx/configs/olimex-lpc1766stk/nsh/defconfig | 2 - nuttx/configs/olimex-lpc1766stk/nx/defconfig | 2 - .../olimex-lpc1766stk/ostest/defconfig | 2 - .../olimex-lpc1766stk/slip-httpd/defconfig | 2 - .../olimex-lpc1766stk/thttpd/defconfig | 2 - .../olimex-lpc1766stk/usbserial/defconfig | 2 - .../olimex-lpc1766stk/usbstorage/defconfig | 2 - .../configs/olimex-lpc1766stk/wlan/defconfig | 2 - nuttx/configs/olimex-lpc2378/nsh/defconfig | 2 - nuttx/configs/olimex-lpc2378/ostest/defconfig | 2 - .../configs/olimex-strp711/nettest/defconfig | 2 - nuttx/configs/olimex-strp711/nsh/defconfig | 2 - nuttx/configs/olimex-strp711/ostest/defconfig | 2 - nuttx/configs/pcblogic-pic32mx/nsh/defconfig | 2 - .../configs/pcblogic-pic32mx/ostest/defconfig | 2 - .../configs/pic32-starterkit/ostest/defconfig | 2 - nuttx/configs/pjrc-8051/defconfig | 1 - nuttx/configs/qemu-i486/nsh/defconfig | 2 - nuttx/configs/qemu-i486/ostest/defconfig | 1 - nuttx/configs/rgmp/arm/default/defconfig | 1 - nuttx/configs/rgmp/arm/nsh/defconfig | 2 - nuttx/configs/rgmp/x86/default/defconfig | 1 - nuttx/configs/rgmp/x86/nsh/defconfig | 2 - nuttx/configs/sam3u-ek/knsh/defconfig | 2 - nuttx/configs/sam3u-ek/nsh/defconfig | 2 - nuttx/configs/sam3u-ek/nx/defconfig | 2 - nuttx/configs/sam3u-ek/ostest/defconfig | 2 - nuttx/configs/sam3u-ek/touchscreen/defconfig | 2 - nuttx/configs/sim/mount/defconfig | 1 - nuttx/configs/sim/nettest/defconfig | 1 - nuttx/configs/sim/nsh/defconfig | 2 - nuttx/configs/sim/nsh2/defconfig | 2 - nuttx/configs/sim/nx/defconfig | 2 - nuttx/configs/sim/nx11/defconfig | 2 - nuttx/configs/sim/nxffs/defconfig | 1 - nuttx/configs/sim/ostest/defconfig | 1 - nuttx/configs/sim/pashello/defconfig | 1 - nuttx/configs/sim/touchscreen/defconfig | 2 - nuttx/configs/skp16c26/ostest/defconfig | 1 - nuttx/configs/stm3210e-eval/RIDE/defconfig | 2 - nuttx/configs/stm3210e-eval/buttons/defconfig | 2 - .../configs/stm3210e-eval/composite/defconfig | 2 - nuttx/configs/stm3210e-eval/nsh/defconfig | 2 - nuttx/configs/stm3210e-eval/nsh2/defconfig | 2 - nuttx/configs/stm3210e-eval/nx/defconfig | 2 - nuttx/configs/stm3210e-eval/nxlines/defconfig | 2 - nuttx/configs/stm3210e-eval/nxtext/defconfig | 2 - nuttx/configs/stm3210e-eval/ostest/defconfig | 2 - .../configs/stm3210e-eval/usbserial/defconfig | 2 - .../stm3210e-eval/usbstorage/defconfig | 2 - nuttx/configs/stm3240g-eval/dhcpd/defconfig | 2 - nuttx/configs/stm3240g-eval/nettest/defconfig | 2 - nuttx/configs/stm3240g-eval/nsh/appconfig | 7 +- nuttx/configs/stm3240g-eval/nsh/defconfig | 2 - nuttx/configs/stm3240g-eval/ostest/defconfig | 2 - nuttx/configs/stm3240g-eval/telnetd/defconfig | 2 - nuttx/configs/stm32f4discovery/nsh/defconfig | 2 - .../configs/stm32f4discovery/ostest/defconfig | 2 - nuttx/configs/sure-pic32mx/nsh/defconfig | 2 - nuttx/configs/sure-pic32mx/ostest/defconfig | 2 - nuttx/configs/teensy/hello/defconfig | 2 - nuttx/configs/teensy/nsh/defconfig | 2 - nuttx/configs/teensy/usbstorage/defconfig | 2 - nuttx/configs/twr-k60n512/nsh/defconfig | 2 - nuttx/configs/twr-k60n512/ostest/defconfig | 2 - nuttx/configs/us7032evb1/nsh/defconfig | 2 - nuttx/configs/us7032evb1/ostest/defconfig | 2 - nuttx/configs/vsn/nsh/defconfig | 2 - nuttx/configs/xtrs/nsh/defconfig | 2 - nuttx/configs/xtrs/ostest/defconfig | 1 - nuttx/configs/xtrs/pashello/defconfig | 1 - .../configs/z16f2800100zcog/ostest/defconfig | 1 - .../z16f2800100zcog/pashello/defconfig | 1 - nuttx/configs/z80sim/nsh/defconfig | 2 - nuttx/configs/z80sim/ostest/defconfig | 1 - nuttx/configs/z80sim/pashello/defconfig | 1 - nuttx/configs/z8encore000zco/ostest/defconfig | 1 - nuttx/configs/z8f64200100kit/ostest/defconfig | 1 - 187 files changed, 629 insertions(+), 1834 deletions(-) create mode 100644 apps/nshlib/nsh_consolemain.c delete mode 100644 apps/nshlib/nsh_serial.c diff --git a/apps/examples/nsh/nsh_main.c b/apps/examples/nsh/nsh_main.c index 53235a8351..5d302e3971 100644 --- a/apps/examples/nsh/nsh_main.c +++ b/apps/examples/nsh/nsh_main.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nsh/nsh_main.c * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * 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; -#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET) + int exitval = 0; int ret; -#endif /* Initialize the NSH library */ nsh_initialize(); - /* Set the priority of this task to something in the middle so that 'nice' - * can both raise and lower the priority. + /* If the Telnet console is selected as a front-end, then start the + * Telnet daemon. */ - mid_priority = (sched_get_priority_max(SCHED_NSH) + sched_get_priority_min(SCHED_NSH)) >> 1; - { - struct sched_param param; - - param.sched_priority = mid_priority; - (void)sched_setscheduler(0, SCHED_NSH, ¶m); - } - - /* 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 +#ifdef CONFIG_NSH_TELNET + ret = nsh_telnetstart(); 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; } diff --git a/apps/examples/telnetd/shell.h b/apps/examples/telnetd/shell.h index 96aab1319e..23b30fda7f 100644 --- a/apps/examples/telnetd/shell.h +++ b/apps/examples/telnetd/shell.h @@ -91,7 +91,6 @@ # define MAIN_STRING "user_start: " #endif - /* Other definitions ********************************************************/ #define SHELL_PROMPT "uIP 1.0> " diff --git a/apps/include/nsh.h b/apps/include/nsh.h index 6977e44bd6..15f35963ca 100644 --- a/apps/include/nsh.h +++ b/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 - * application start-up prior to executing nsh_consolemain() or - * nsh_telnetmain(). - */ + * 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 + * + ****************************************************************************/ 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). - * nsh_telnetmain() starts a telnet daemon that will allow multiple - * connections via telnet. + * 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. * - * 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 diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index 70c27a414e..853d24baf5 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/nshlib/Makefile # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # 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 \ - nsh_envcmds.c nsh_dbgcmds.c +CSRCS = nsh_parse.c nsh_console.c nsh_fscmds.c nsh_ddcmd.c nsh_proccmds.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) diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt index fbdf9178a1..bc496135d0 100644 --- a/apps/nshlib/README.txt +++ b/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: diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index 9a5a49d42c..90d02bb7f4 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh.h * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -43,22 +43,19 @@ #include #include + +#include #include #include #include -#ifdef CONFIG_NSH_CONSOLE -# include -#endif - /**************************************************************************** * Definitions ****************************************************************************/ - -/* The telnetd interface and background commands require pthread support */ +/* Configuration ************************************************************/ +/* 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 -{ - /* 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; -}; - +struct nsh_vtbl_s; /* Defined in nsh_console.h */ typedef int (*cmd_t)(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); /**************************************************************************** diff --git a/apps/nshlib/nsh_apps.c b/apps/nshlib/nsh_apps.c index d70c0d10fa..c6f7509489 100644 --- a/apps/nshlib/nsh_apps.c +++ b/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 * @@ -51,6 +51,7 @@ #include #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); - if (ret < 0) - { - return -errno; - } + ret = exec_namedapp(cmd, (FAR const char **)argv); + if (ret < 0) + { + return -errno; + } #ifdef CONFIG_SCHED_WAITPID - if (vtbl->np.np_bg == false) - { - waitpid(ret, NULL, 0); - } - else + if (vtbl->np.np_bg == false) + { + waitpid(ret, NULL, 0); + } + else #endif - { - struct sched_param param; - sched_getparam(0, ¶m); - nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority); - } + { + struct sched_param param; + sched_getparam(0, ¶m); + nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority); + } - return OK; + return OK; } #endif /* CONFIG_NSH_BUILTIN_APPS */ diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c new file mode 100644 index 0000000000..372ef5a1f3 --- /dev/null +++ b/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 + * + * 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 + +#include +#include + +#include + +#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; +} diff --git a/apps/nshlib/nsh_dbgcmds.c b/apps/nshlib/nsh_dbgcmds.c index e9d6d9dab9..31199db3ed 100644 --- a/apps/nshlib/nsh_dbgcmds.c +++ b/apps/nshlib/nsh_dbgcmds.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/dbg_dbgcmds.c * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ #include #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) - { - /* Yes, was the supplied value within range? */ + if (mem.dm_write) + { + /* Yes, was the supplied value within range? */ - if (mem.dm_value > 0x000000ff) - { - nsh_output(vtbl, g_fmtargrange, argv[0]); - return ERROR; - } + if (mem.dm_value > 0x000000ff) + { + nsh_output(vtbl, g_fmtargrange, argv[0]); + return ERROR; + } - /* Write the value and re-read the address so that we print its - * current value (if the address is a process address, then the - * value read might not necessarily be the value written). - */ + /* Write the value and re-read the address so that we print its + * current value (if the address is a process address, then the + * value read might not necessarily be the value written). + */ - *ptr = (uint8_t)mem.dm_value; - nsh_output(vtbl, " -> 0x%02x", *ptr); - } + *ptr = (uint8_t)mem.dm_value; + 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) - { - /* Yes, was the supplied value within range? */ + if (mem.dm_write) + { + /* Yes, was the supplied value within range? */ - if (mem.dm_value > 0x0000ffff) - { - nsh_output(vtbl, g_fmtargrange, argv[0]); - return ERROR; - } + if (mem.dm_value > 0x0000ffff) + { + nsh_output(vtbl, g_fmtargrange, argv[0]); + return ERROR; + } - /* Write the value and re-read the address so that we print its - * current value (if the address is a process address, then the - * value read might not necessarily be the value written). - */ + /* Write the value and re-read the address so that we print its + * current value (if the address is a process address, then the + * value read might not necessarily be the value written). + */ - *ptr = (uint16_t)mem.dm_value; - nsh_output(vtbl, " -> 0x%04x", *ptr); - } + *ptr = (uint16_t)mem.dm_value; + 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) - { - /* Write the value and re-read the address so that we print its - * current value (if the address is a process address, then the - * value read might not necessarily be the value written). - */ + if (mem.dm_write) + { + /* Write the value and re-read the address so that we print its + * current value (if the address is a process address, then the + * value read might not necessarily be the value written). + */ - *ptr = mem.dm_value; - nsh_output(vtbl, " -> 0x%08x", *ptr); - } + *ptr = mem.dm_value; + 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; } diff --git a/apps/nshlib/nsh_ddcmd.c b/apps/nshlib/nsh_ddcmd.c index 11652fe7eb..5b03cbd2f3 100644 --- a/apps/nshlib/nsh_ddcmd.c +++ b/apps/nshlib/nsh_ddcmd.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_ddcmd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -41,6 +41,7 @@ #include #include + #include #include #include @@ -51,7 +52,9 @@ #include #include + #include "nsh.h" +#include "nsh_console.h" #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_NSH_DISABLE_DD) diff --git a/apps/nshlib/nsh_envcmds.c b/apps/nshlib/nsh_envcmds.c index 520dd76e71..7603bf779e 100644 --- a/apps/nshlib/nsh_envcmds.c +++ b/apps/nshlib/nsh_envcmds.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_envcmds.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ #include #include "nsh.h" +#include "nsh_console.h" /**************************************************************************** * Definitions diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c index 350055fae5..e478ddefbc 100644 --- a/apps/nshlib/nsh_fscmds.c +++ b/apps/nshlib/nsh_fscmds.c @@ -68,6 +68,7 @@ #include #include "nsh.h" +#include "nsh_console.h" /**************************************************************************** * Definitions diff --git a/apps/nshlib/nsh_mmcmds.c b/apps/nshlib/nsh_mmcmds.c index fd37df1683..545ae60ad4 100644 --- a/apps/nshlib/nsh_mmcmds.c +++ b/apps/nshlib/nsh_mmcmds.c @@ -42,6 +42,7 @@ #include #include "nsh.h" +#include "nsh_console.h" /**************************************************************************** * Definitions diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 8285da2955..04d10b1e16 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_netcmds.c * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * 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 diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index 245d503802..12286cf841 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_netinit.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * This is influenced by similar logic from uIP: * diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index cc04432588..cec167f05d 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -64,6 +64,7 @@ #include #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) diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c index c0dc1713f3..487214501f 100644 --- a/apps/nshlib/nsh_proccmds.c +++ b/apps/nshlib/nsh_proccmds.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_proccmds.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,6 +46,7 @@ #include #include "nsh.h" +#include "nsh_console.h" /**************************************************************************** * Definitions diff --git a/apps/nshlib/nsh_romfsetc.c b/apps/nshlib/nsh_romfsetc.c index d97e6591a9..4134b45a3d 100644 --- a/apps/nshlib/nsh_romfsetc.c +++ b/apps/nshlib/nsh_romfsetc.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_romfsetc.c * - * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2008-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/nshlib/nsh_serial.c b/apps/nshlib/nsh_serial.c deleted file mode 100644 index 57cb1b1c17..0000000000 --- a/apps/nshlib/nsh_serial.c +++ /dev/null @@ -1,534 +0,0 @@ -/**************************************************************************** - * apps/nshlib/nsh_serial.c - * - * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "nsh.h" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Are we using the NuttX console for I/O? Or some other character device? */ - -#ifdef CONFIG_NSH_CONDEV -# define INFD(p) ((p)->ss_confd) -# define INSTREAM(p) ((p)->ss_constream) -# define OUTFD(p) ((p)->ss_confd) -# define OUTSTREAM(p) ((p)->ss_constream) -#else -# define INFD(p) 0 -# define INSTREAM(p) stdin -# define OUTFD(p) 1 -# define OUTSTREAM(p) stdout -#endif - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -struct serial_s -{ - /* NSH front-end call table */ - - struct nsh_vtbl_s ss_vtbl; - - /* NSH input/output streams */ - -#ifdef CONFIG_NSH_CONDEV - int ss_confd; /* Console I/O file descriptor */ -#endif - int ss_outfd; /* Output file descriptor (possibly redirected) */ -#ifdef CONFIG_NSH_CONDEV - FILE *ss_constream; /* Console I/O stream (possibly redirected) */ -#endif - FILE *ss_outstream; /* Output stream */ - - /* Line input buffer */ - - char ss_line[CONFIG_NSH_LINELEN]; -}; - -struct serialsave_s -{ - int ss_outfd; /* Re-directed output file descriptor */ - FILE *ss_outstream; /* Re-directed output stream */ -}; - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -#ifndef CONFIG_NSH_DISABLEBG -static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl); -static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl); -#endif -static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes); -static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...); -static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); -static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); -static void nsh_consoleundirect(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save); -static void nsh_consoleexit(FAR struct nsh_vtbl_s *vtbl); - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: nsh_allocstruct - ****************************************************************************/ - -static inline FAR struct serial_s *nsh_allocstruct(void) -{ - struct serial_s *pstate = (struct serial_s *)zalloc(sizeof(struct serial_s)); - if (pstate) - { - /* Initialize the call table */ - -#ifndef CONFIG_NSH_DISABLEBG - pstate->ss_vtbl.clone = nsh_consoleclone; - pstate->ss_vtbl.release = nsh_consolerelease; -#endif - pstate->ss_vtbl.write = nsh_consolewrite; - pstate->ss_vtbl.output = nsh_consoleoutput; - pstate->ss_vtbl.linebuffer = nsh_consolelinebuffer; - pstate->ss_vtbl.redirect = nsh_consoleredirect; - pstate->ss_vtbl.undirect = nsh_consoleundirect; - pstate->ss_vtbl.exit = nsh_consoleexit; - - /* (Re-) open the console input device */ - -#ifdef CONFIG_NSH_CONDEV - pstate->ss_confd = open(CONFIG_NSH_CONDEV, O_RDWR); - if (pstate->ss_confd < 0) - { - free(pstate); - return NULL; - } - - /* Create a standard C stream on the console device */ - - pstate->ss_constream = fdopen(pstate->ss_confd, "r+"); - if (!pstate->ss_constream) - { - close(pstate->ss_confd); - free(pstate); - return NULL; - } -#endif - - /* Initialize the output stream */ - - pstate->ss_outfd = OUTFD(pstate); - pstate->ss_outstream = OUTSTREAM(pstate); - } - return pstate; -} - -/**************************************************************************** - * Name: nsh_openifnotopen - ****************************************************************************/ - -static int nsh_openifnotopen(struct serial_s *pstate) -{ - /* The stream is open in a lazy fashion. This is done because the file - * descriptor may be opened on a different task than the stream. - */ - - if (!pstate->ss_outstream) - { - pstate->ss_outstream = fdopen(pstate->ss_outfd, "w"); - if (!pstate->ss_outstream) - { - return ERROR; - } - } - return 0; -} - -/**************************************************************************** - * Name: nsh_closeifnotclosed - * - * Description: - * Close the output stream if it is not the standard output stream. - * - ****************************************************************************/ - -static void nsh_closeifnotclosed(struct serial_s *pstate) -{ - if (pstate->ss_outstream == OUTSTREAM(pstate)) - { - fflush(OUTSTREAM(pstate)); - pstate->ss_outfd = OUTFD(pstate); - } - else - { - if (pstate->ss_outstream) - { - fflush(pstate->ss_outstream); - fclose(pstate->ss_outstream); - } - else if (pstate->ss_outfd >= 0 && pstate->ss_outfd != OUTFD(pstate)) - { - close(pstate->ss_outfd); - } - - pstate->ss_outfd = -1; - pstate->ss_outstream = NULL; - } -} - -/**************************************************************************** - * Name: nsh_consolewrite - * - * Description: - * write a buffer to the remote shell window. - * - * Currently only used by cat. - * - ****************************************************************************/ - -static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - ssize_t ret; - - /* The stream is open in a lazy fashion. This is done because the file - * descriptor may be opened on a different task than the stream. The - * actual open will then occur with the first output from the new task. - */ - - if (nsh_openifnotopen(pstate) != 0) - { - return (ssize_t)ERROR; - } - - /* Write the data to the output stream */ - - ret = fwrite(buffer, 1, nbytes, pstate->ss_outstream); - if (ret < 0) - { - dbg("[%d] Failed to send buffer: %d\n", pstate->ss_outfd, errno); - } - return ret; -} - -/**************************************************************************** - * Name: nsh_consoleoutput - * - * Description: - * Print a string to the currently selected stream. - * - ****************************************************************************/ - -static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - va_list ap; - int ret; - - /* The stream is open in a lazy fashion. This is done because the file - * descriptor may be opened on a different task than the stream. The - * actual open will then occur with the first output from the new task. - */ - - if (nsh_openifnotopen(pstate) != 0) - { - return ERROR; - } - - va_start(ap, fmt); - ret = vfprintf(pstate->ss_outstream, fmt, ap); - va_end(ap); - - return ret; -} - -/**************************************************************************** - * Name: nsh_consolelinebuffer - * - * Description: - * Return a reference to the current line buffer - * - ****************************************************************************/ - -static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - return pstate->ss_line; -} - -/**************************************************************************** - * Name: nsh_consoleclone - * - * Description: - * Make an independent copy of the vtbl - * - ****************************************************************************/ - -#ifndef CONFIG_NSH_DISABLEBG -static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl) -{ - FAR struct serial_s *pclone = nsh_allocstruct(); - return &pclone->ss_vtbl; -} -#endif - -/**************************************************************************** - * Name: nsh_consolerelease - * - * Description: - * Release the cloned instance - * - ****************************************************************************/ - -#ifndef CONFIG_NSH_DISABLEBG -static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - - /* Close the output stream */ - - nsh_closeifnotclosed(pstate); - - /* Close the console stream */ - -#ifdef CONFIG_NSH_CONDEV - (void)fclose(pstate->ss_constream); -#endif - - /* Then release the vtable container */ - - free(pstate); -} -#endif - -/**************************************************************************** - * Name: nsh_consoleredirect - * - * Description: - * Set up for redirected output. This function is called from nsh_parse() - * in two different contexts: - * - * 1) Redirected background commands of the form: command > xyz.text & - * - * In this case: - * - vtbl: A newly allocated and initialized instance created by - * nsh_consoleclone, - * - fd:- The file descriptor of the redirected output - * - save: NULL - * - * nsh_consolerelease() will perform the clean-up when the clone is - * destroyed. - * - * 2) Redirected foreground commands of the form: command > xyz.txt - * - * In this case: - * - vtbl: The current state structure, - * - fd: The file descriptor of the redirected output - * - save: Where to save the re-directed registers. - * - * nsh_consoleundirect() will perform the clean-up after the redirected - * command completes. - * - ****************************************************************************/ - -static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - FAR struct serialsave_s *ssave = (FAR struct serialsave_s *)save; - - /* Case 1: Redirected foreground commands */ - - if (ssave) - { - /* pstate->ss_outstream and ss_outfd refer refer to the - * currently opened output stream. If the output stream is open, flush - * any pending output. - */ - - if (pstate->ss_outstream) - { - fflush(pstate->ss_outstream); - } - - /* Save the current fd and stream values. These will be restored - * when nsh_consoleundirect() is called. - */ - - ssave->ss_outfd = pstate->ss_outfd; - ssave->ss_outstream = pstate->ss_outstream; - } - else - { - /* nsh_consoleclone() set pstate->ss_outfd and ss_outstream to refer - * to standard out. We just want to leave these alone and overwrite - * them with the fd for the re-directed stream. - */ - } - - /* In either case, set the fd of the new, re-directed output and nullify - * the output stream (it will be fdopen'ed if it is used). - */ - - pstate->ss_outfd = fd; - pstate->ss_outstream = NULL; -} - -/**************************************************************************** - * Name: nsh_consoleundirect - * - * Description: - * Set up for redirected output - * - ****************************************************************************/ - -static void nsh_consoleundirect(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save) -{ - FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; - FAR struct serialsave_s *ssave = (FAR struct serialsave_s *)save; - - nsh_closeifnotclosed(pstate); - pstate->ss_outfd = ssave->ss_outfd; - pstate->ss_outstream = ssave->ss_outstream; -} - -/**************************************************************************** - * Name: nsh_consoleexit - * - * Description: - * Exit the shell task - * - ****************************************************************************/ - -static void nsh_consoleexit(FAR struct nsh_vtbl_s *vtbl) -{ - exit(0); -} - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: nsh_consolemain - ****************************************************************************/ - -int nsh_consolemain(int argc, char *argv[]) -{ - FAR struct serial_s *pstate = nsh_allocstruct(); - DEBUGASSERT(pstate); - int ret; - - /* If we are using a USB console, then we will have to wait for the USB to - * be connected/ - */ - -#ifdef HAVE_USB_CONSOLE - DEBUGASSERT(nsh_usbconsole() == OK); -#endif - - /* Present a greeting */ - - fputs(g_nshgreeting, pstate->ss_outstream); - fflush(pstate->ss_outstream); - - /* Execute the startup script */ - -#ifdef CONFIG_NSH_ROMFSETC - (void)nsh_script(&pstate->ss_vtbl, "init", NSH_INITPATH); -#endif - - /* Then enter the command line parsing loop */ - - for (;;) - { - /* Display the prompt string */ - - fputs(g_nshprompt, pstate->ss_outstream); - fflush(pstate->ss_outstream); - - /* Get the next line of input */ - - ret = readline(pstate->ss_line, CONFIG_NSH_LINELEN, - INSTREAM(pstate), OUTSTREAM(pstate)); - if (ret > 0) - { - /* Parse process the command */ - - (void)nsh_parse(&pstate->ss_vtbl, pstate->ss_line); - fflush(pstate->ss_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->ss_outstream, g_fmtcmdfailed, "readline", NSH_ERRNO_OF(-ret)); - return 1; - } - } - - return OK; -} diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c index 0670c9a05c..66923deb23 100644 --- a/apps/nshlib/nsh_telnetd.c +++ b/apps/nshlib/nsh_telnetd.c @@ -1,14 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_telnetd.c * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * This is a leverage of similar logic from uIP: - * - * Author: Adam Dunkels - * Copyright (c) 2003, Adam Dunkels. - * All rights reserved. + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,23 +11,26 @@ * 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 of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software + * 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 INSTITUTE 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 INSTITUTE 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. + * 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. + * ****************************************************************************/ /**************************************************************************** @@ -42,812 +39,148 @@ #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#if defined(CONFIG_NSH_DHCPC) -# include -# include -#endif +#include #include "nsh.h" +#include "nsh_console.h" #ifdef CONFIG_NSH_TELNET /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ -#define ISO_nl 0x0a -#define ISO_cr 0x0d - -#define STATE_NORMAL 0 -#define STATE_IAC 1 -#define STATE_WILL 2 -#define STATE_WONT 3 -#define STATE_DO 4 -#define STATE_DONT 5 -#define STATE_CLOSE 6 - -#define TELNET_IAC 255 -#define TELNET_WILL 251 -#define TELNET_WONT 252 -#define TELNET_DO 253 -#define TELNET_DONT 254 - -#ifdef CONFIG_NSH_TELNETD_DUMPBUFFER -# define nsh_telnetdump(vtbl,msg,buf,nb) nsh_dumpbuffer(vtbl,msg,buf,nb) -#else -# define nsh_telnetdump(vtbl,msg,buf,nb) -#endif - /**************************************************************************** * Private Types ****************************************************************************/ -struct telnetio_s -{ - sem_t tio_sem; - int tio_sockfd; - uint8_t tio_bufndx; - uint8_t tio_state; - char tio_inbuffer[CONFIG_NSH_IOBUFFER_SIZE]; -}; - -struct redirect_s -{ - int rd_fd; /* Re-direct file descriptor */ - FILE *rd_stream; /* Re-direct stream */ -}; - -struct telnetsave_s -{ - bool ts_redirected; - union - { - struct telnetio_s *tn; - struct redirect_s rd; - } u; -}; - -struct telnetd_s -{ - struct nsh_vtbl_s tn_vtbl; - uint16_t tn_sndlen; - bool tn_redirected; - union - { - struct telnetio_s *tn; - struct redirect_s rd; - } u; - char tn_outbuffer[CONFIG_NSH_IOBUFFER_SIZE]; - char tn_cmd[CONFIG_NSH_LINELEN]; -}; - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_NSH_DISABLEBG -static void tio_semtake(struct telnetio_s *tio); -static FAR struct nsh_vtbl_s *nsh_telnetclone(FAR struct nsh_vtbl_s *vtbl); -#endif -static void nsh_telnetrelease(FAR struct nsh_vtbl_s *vtbl); -static ssize_t nsh_telnetwrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes); -static int nsh_telnetoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...); -static int nsh_redirectoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...); -static FAR char *nsh_telnetlinebuffer(FAR struct nsh_vtbl_s *vtbl); -static void nsh_telnetredirect(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); -static void nsh_telnetundirect(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save); -static void nsh_telnetexit(FAR struct nsh_vtbl_s *vtbl); +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ /**************************************************************************** * Private Functions ****************************************************************************/ -/**************************************************************************** - * Name: tio_semtake - ****************************************************************************/ - -static void tio_semtake(struct telnetio_s *tio) -{ - /* Take the semaphore (perhaps waiting) */ - - while (sem_wait(&tio->tio_sem) != 0) - { - /* The only case that an error should occur here is if the wait was - * awakened by a signal. - */ - - ASSERT(errno == EINTR); - } -} - -/**************************************************************************** - * Name: tio_semgive - ****************************************************************************/ - -#define tio_semgive(tio) ASSERT(sem_post(&tio->tio_sem) == 0) - -/**************************************************************************** - * Name: nsh_allocstruct - ****************************************************************************/ - -static FAR struct telnetd_s *nsh_allocstruct(void) -{ - struct telnetd_s *pstate = (struct telnetd_s *)zalloc(sizeof(struct telnetd_s)); - if (pstate) - { -#ifndef CONFIG_NSH_DISABLEBG - pstate->tn_vtbl.clone = nsh_telnetclone; - pstate->tn_vtbl.release = nsh_telnetrelease; -#endif - pstate->tn_vtbl.write = nsh_telnetwrite; - pstate->tn_vtbl.output = nsh_telnetoutput; - pstate->tn_vtbl.linebuffer = nsh_telnetlinebuffer; - pstate->tn_vtbl.redirect = nsh_telnetredirect; - pstate->tn_vtbl.undirect = nsh_telnetundirect; - pstate->tn_vtbl.exit = nsh_telnetexit; - } - return pstate; -} - -/**************************************************************************** - * Name: nsh_openifnotopen - ****************************************************************************/ - -static int nsh_openifnotopen(struct telnetd_s *pstate) -{ - struct redirect_s *rd = &pstate->u.rd; - - /* The stream is open in a lazy fashion. This is done because the file - * descriptor may be opened on a different task than the stream. - */ - - if (!rd->rd_stream) - { - rd->rd_stream = fdopen(rd->rd_fd, "w"); - if (!rd->rd_stream) - { - return ERROR; - } - } - return 0; -} - -/**************************************************************************** - * Name: nsh_closeifnotclosed - ****************************************************************************/ - -static void nsh_closeifnotclosed(struct telnetd_s *pstate) -{ - struct redirect_s *rd = &pstate->u.rd; - - if (rd->rd_stream == stdout) - { - fflush(stdout); - rd->rd_fd = 1; - } - else - { - if (rd->rd_stream) - { - fflush(rd->rd_stream); - fclose(rd->rd_stream); - } - else if (rd->rd_fd >= 0 && rd->rd_fd != 1) - { - close(rd->rd_fd); - } - - rd->rd_fd = -1; - rd->rd_stream = NULL; - } -} - -/**************************************************************************** - * Name: nsh_putchar - * - * Description: - * Add another parsed character to the TELNET command string - * - * Assumption: - * Caller holds TIO semaphore - * - ****************************************************************************/ - -static void nsh_putchar(struct telnetd_s *pstate, uint8_t ch) -{ - struct telnetio_s *tio = pstate->u.tn; - - /* Ignore carriage returns */ - - if (ch == ISO_cr) - { - return; - } - - /* Add all other characters to the cmd buffer */ - - pstate->tn_cmd[tio->tio_bufndx] = ch; - - /* If a newline was added or if the buffer is full, then process it now */ - - if (ch == ISO_nl || tio->tio_bufndx == (CONFIG_NSH_LINELEN - 1)) - { - pstate->tn_cmd[tio->tio_bufndx] = '\0'; - nsh_telnetdump(&pstate->tn_vtbl, "TELNET CMD", - (uint8_t*)pstate->tn_cmd, strlen(pstate->tn_cmd)); - nsh_parse(&pstate->tn_vtbl, pstate->tn_cmd); - tio->tio_bufndx = 0; - } - else - { - tio->tio_bufndx++; - vdbg("Add '%c', bufndx=%d\n", ch, tio->tio_bufndx); - } -} - -/**************************************************************************** - * Name: nsh_sendopt - * - * Description: - * - ****************************************************************************/ - -static void nsh_sendopt(struct telnetd_s *pstate, uint8_t option, uint8_t value) -{ - struct telnetio_s *tio = pstate->u.tn; - uint8_t optbuf[4]; - optbuf[0] = TELNET_IAC; - optbuf[1] = option; - optbuf[2] = value; - optbuf[3] = 0; - - nsh_telnetdump(&pstate->tn_vtbl, "Send optbuf", optbuf, 4); - tio_semtake(tio); /* Only one call to send at a time */ - if (send(tio->tio_sockfd, optbuf, 4, 0) < 0) - { - dbg("[%d] Failed to send TELNET_IAC: %d\n", tio->tio_sockfd, errno); - } - tio_semgive(tio); -} - -/**************************************************************************** - * Name: nsh_flush - * - * Description: - * Dump the buffered output info. - * - ****************************************************************************/ - -static void nsh_flush(FAR struct telnetd_s *pstate) -{ - struct telnetio_s *tio = pstate->u.tn; - - if (pstate->tn_sndlen > 0) - { - nsh_telnetdump(&pstate->tn_vtbl, "Shell output", - (uint8_t*)pstate->tn_outbuffer, pstate->tn_sndlen); - tio_semtake(tio); /* Only one call to send at a time */ - if (send(tio->tio_sockfd, pstate->tn_outbuffer, pstate->tn_sndlen, 0) < 0) - { - dbg("[%d] Failed to send response: %d\n", tio->tio_sockfd, errno); - } - tio_semgive(tio); - } - pstate->tn_sndlen = 0; -} - -/**************************************************************************** - * Name: nsh_receive - * - * Description: - * Process a received TELENET buffer - * - ****************************************************************************/ - -static int nsh_receive(struct telnetd_s *pstate, size_t len) -{ - struct telnetio_s *tio = pstate->u.tn; - char *ptr = tio->tio_inbuffer; - uint8_t ch; - - while (len > 0) - { - ch = *ptr++; - len--; - - vdbg("ch=%02x state=%d\n", ch, tio->tio_state); - switch (tio->tio_state) - { - case STATE_IAC: - if (ch == TELNET_IAC) - { - nsh_putchar(pstate, ch); - tio->tio_state = STATE_NORMAL; - } - else - { - switch (ch) - { - case TELNET_WILL: - tio->tio_state = STATE_WILL; - break; - - case TELNET_WONT: - tio->tio_state = STATE_WONT; - break; - - case TELNET_DO: - tio->tio_state = STATE_DO; - break; - - case TELNET_DONT: - tio->tio_state = STATE_DONT; - break; - - default: - tio->tio_state = STATE_NORMAL; - break; - } - } - break; - - case STATE_WILL: - /* Reply with a DONT */ - - nsh_sendopt(pstate, TELNET_DONT, ch); - tio->tio_state = STATE_NORMAL; - break; - - case STATE_WONT: - /* Reply with a DONT */ - - nsh_sendopt(pstate, TELNET_DONT, ch); - tio->tio_state = STATE_NORMAL; - break; - - case STATE_DO: - /* Reply with a WONT */ - - nsh_sendopt(pstate, TELNET_WONT, ch); - tio->tio_state = STATE_NORMAL; - break; - - case STATE_DONT: - /* Reply with a WONT */ - - nsh_sendopt(pstate, TELNET_WONT, ch); - tio->tio_state = STATE_NORMAL; - break; - - case STATE_NORMAL: - if (ch == TELNET_IAC) - { - tio->tio_state = STATE_IAC; - } - else - { - nsh_putchar(pstate, ch); - } - break; - } - } - return OK; -} - -/**************************************************************************** - * Name: nsh_connection - * - * Description: - * Each time a new connection to port 23 is made, a new thread is created - * that begins at this entry point. There should be exactly one argument - * and it should be the socket descriptor (+1). - * - ****************************************************************************/ - -static void *nsh_connection(void *arg) -{ - struct telnetd_s *pstate = nsh_allocstruct(); - struct telnetio_s *tio = (struct telnetio_s *)zalloc(sizeof(struct telnetio_s)); - struct nsh_vtbl_s *vtbl = &pstate->tn_vtbl; - int sockfd = (int)arg; - int ret = ERROR; - - dbg("[%d] Started\n", sockfd); - - /* Verify that the state structure was successfully allocated */ - - if (pstate && tio) - { - /* Initialize the thread state structure */ - - sem_init(&tio->tio_sem, 0, 1); - tio->tio_sockfd = sockfd; - tio->tio_state = STATE_NORMAL; - pstate->u.tn = tio; - - /* Output a greeting */ - - nsh_output(vtbl, g_nshgreeting); - - /* Execute the startup script */ - -#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_CONSOLE) - (void)nsh_script(vtbl, "init", NSH_INITPATH); -#endif - - /* Loop processing each TELNET command */ - - do - { - /* Display the prompt string */ - - nsh_output(vtbl, g_nshprompt); - nsh_flush(pstate); - - /* Read a buffer of data from the TELNET client */ - - ret = recv(tio->tio_sockfd, tio->tio_inbuffer, - CONFIG_NSH_IOBUFFER_SIZE, 0); - if (ret > 0) - { - - /* Process the received TELNET data */ - - nsh_telnetdump(vtbl, "Received buffer", - (uint8_t*)tio->tio_inbuffer, ret); - ret = nsh_receive(pstate, ret); - } - } - while (ret >= 0 && tio->tio_state != STATE_CLOSE); - dbg("[%d] ret=%d tn.tio_state=%d\n", sockfd, ret, tio->tio_state); - - /* End of command processing -- Clean up and exit */ - } - - /* Exit the task */ - - if (pstate) - { - free(pstate); - } - - if (tio) - { - sem_destroy(&tio->tio_sem); - free(tio); - } - - dbg("[%d] Exitting\n", sockfd); - close(sockfd); - return NULL; -} - -/**************************************************************************** - * Name: nsh_telnetwrite - * - * Description: - * write a buffer to the remote shell window. - * - * Currently only used by cat. - * - ****************************************************************************/ - -static ssize_t nsh_telnetwrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes) -{ - struct telnetd_s *pstate = (struct telnetd_s *)vtbl; - struct telnetio_s *tio = pstate->u.tn; - ssize_t ret = nbytes; - - /* Flush anything already in the output buffer */ - - nsh_flush(pstate); - - /* Then write the user buffer */ - - nsh_telnetdump(&pstate->tn_vtbl, "Buffer output",(uint8_t*)buffer, nbytes); - - tio_semtake(tio); /* Only one call to send at a time */ - ret = send(tio->tio_sockfd, buffer, nbytes, 0); - if (ret < 0) - { - dbg("[%d] Failed to send buffer: %d\n", tio->tio_sockfd, errno); - } - - tio_semgive(tio); - return ret; -} - -/**************************************************************************** - * Name: nsh_telnetoutput - * - * Description: - * Print a string to the remote shell window. - * - * This function is implemented by the shell GUI / telnet server and - * can be called by the shell back-end to output a string in the - * shell window. The string is automatically appended with a linebreak. - * - ****************************************************************************/ - -static int nsh_telnetoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) -{ - struct telnetd_s *pstate = (struct telnetd_s *)vtbl; - int nbytes = pstate->tn_sndlen; - int len; - va_list ap; - - /* Put the new info into the buffer. Here we are counting on the fact that - * no output strings will exceed CONFIG_NSH_LINELEN! - */ - - va_start(ap, fmt); - vsnprintf(&pstate->tn_outbuffer[nbytes], - (CONFIG_NSH_IOBUFFER_SIZE - 1) - nbytes, fmt, ap); - va_end(ap); - - /* Get the size of the new string just added and the total size of - * buffered data - */ - - len = strlen(&pstate->tn_outbuffer[nbytes]); - nbytes += len; - - /* Expand any terminating \n to \r\n */ - - if (nbytes < (CONFIG_NSH_IOBUFFER_SIZE - 2) && - pstate->tn_outbuffer[nbytes-1] == '\n') - { - pstate->tn_outbuffer[nbytes-1] = ISO_cr; - pstate->tn_outbuffer[nbytes] = ISO_nl; - pstate->tn_outbuffer[nbytes+1] = '\0'; - nbytes++; - } - pstate->tn_sndlen = nbytes; - - /* Flush to the network if the buffer does not have room for one more - * maximum length string. - */ - - if (nbytes > CONFIG_NSH_IOBUFFER_SIZE - CONFIG_NSH_LINELEN) - { - nsh_flush(pstate); - } - - return len; -} - -/**************************************************************************** - * Name: nsh_redirectoutput - * - * Description: - * Print a string to the currently selected stream. - * - ****************************************************************************/ - -static int nsh_redirectoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) -{ - FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; - va_list ap; - int ret; - - /* The stream is open in a lazy fashion. This is done because the file - * descriptor may be opened on a different task than the stream. The - * actual open will then occur with the first output from the new task. - */ - - if (nsh_openifnotopen(pstate) != 0) - { - return ERROR; - } - - va_start(ap, fmt); - ret = vfprintf(pstate->u.rd.rd_stream, fmt, ap); - va_end(ap); - - return ret; -} - -/**************************************************************************** - * Name: nsh_telnetlinebuffer - * - * Description: - * Return a reference to the current line buffer - * -* ****************************************************************************/ - -static FAR char *nsh_telnetlinebuffer(FAR struct nsh_vtbl_s *vtbl) -{ - struct telnetd_s *pstate = (struct telnetd_s *)vtbl; - return pstate->tn_cmd; -} - -/**************************************************************************** - * Name: nsh_telnetclone - * - * Description: - * Make an independent copy of the vtbl - * - ****************************************************************************/ - -#ifndef CONFIG_NSH_DISABLEBG -static FAR struct nsh_vtbl_s *nsh_telnetclone(FAR struct nsh_vtbl_s *vtbl) -{ - FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; - FAR struct telnetd_s *pclone = nsh_allocstruct(); - FAR struct nsh_vtbl_s *ret = NULL; - - if (pclone) - { - if (pstate->tn_redirected) - { - pclone->tn_redirected = true; - pclone->tn_vtbl.output = nsh_redirectoutput; - pclone->u.rd.rd_fd = pstate->u.rd.rd_fd; - pclone->u.rd.rd_stream = NULL; - } - else - { - pclone->u.tn = pstate->u.tn; - } - ret = &pclone->tn_vtbl; - } - return ret; -} -#endif - -/**************************************************************************** - * Name: nsh_telnetrelease - * - * Description: - * Release the cloned instance - * - ****************************************************************************/ - -#ifndef CONFIG_NSH_DISABLEBG -static void nsh_telnetrelease(FAR struct nsh_vtbl_s *vtbl) -{ - FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; - - if (pstate->tn_redirected) - { - nsh_closeifnotclosed(pstate); - } - else - { - nsh_flush(pstate); - } - free(pstate); -} -#endif - -/**************************************************************************** - * Name: nsh_telnetredirect - * - * Description: - * Set up for redirected output. This function is called from nsh_parse() - * in two different contexts: - * - * 1) Redirected background commands of the form: command > xyz.text & - * - * In this case: - * - vtbl: A newly allocated and initialized instance created by - * nsh_telnetclone, - * - fd:- The file descriptor of the redirected output - * - save: NULL - * - * nsh_telnetrelease() will perform the clean-up when the clone is - * destroyed. - * - * 2) Redirected foreground commands of the form: command > xyz.txt - * - * In this case: - * - vtbl: The current state structure, - * - fd: The file descriptor of the redirected output - * - save: Where to save the re-directed registers. - * - * nsh_telnetundirect() will perform the clean-up after the redirected - * command completes. - * - ****************************************************************************/ - -static void nsh_telnetredirect(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save) -{ - FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; - FAR struct telnetsave_s *ssave = (FAR struct telnetsave_s *)save; - - if (pstate->tn_redirected) - { - (void)nsh_openifnotopen(pstate); - fflush(pstate->u.rd.rd_stream); - if (!ssave) - { - fclose(pstate->u.rd.rd_stream); - } - } - - if (ssave) - { - ssave->ts_redirected = pstate->tn_redirected; - memcpy(&ssave->u.rd, &pstate->u.rd, sizeof(struct redirect_s)); - } - - pstate->tn_redirected = true; - pstate->u.rd.rd_fd = fd; - pstate->u.rd.rd_stream = NULL; -} - -/**************************************************************************** - * Name: nsh_telnetundirect - * - * Description: - * Set up for redirected output - * - ****************************************************************************/ - -static void nsh_telnetundirect(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save) -{ - FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; - FAR struct telnetsave_s *ssave = (FAR struct telnetsave_s *)save; - - if (pstate->tn_redirected) - { - nsh_closeifnotclosed(pstate); - } - - pstate->tn_redirected = ssave->ts_redirected; - memcpy(&pstate->u.rd, &ssave->u.rd, sizeof(struct redirect_s)); -} - -/**************************************************************************** - * Name: nsh_telnetexit - * - * Description: - * Quit the shell instance - * - ****************************************************************************/ - -static void nsh_telnetexit(FAR struct nsh_vtbl_s *vtbl) -{ - struct telnetd_s *pstate = (struct telnetd_s *)vtbl; - pstate->u.tn->tio_state = STATE_CLOSE; -} - /**************************************************************************** * Public Functions ****************************************************************************/ /**************************************************************************** * Name: nsh_telnetmain - * - * Description: - * This is the main processing thread for telnetd. It never returns - * unless an error occurs - * ****************************************************************************/ int nsh_telnetmain(int argc, char *argv[]) { - /* Execute nsh_connection() on each connection to port 23 */ + FAR struct console_stdio_s *pstate = nsh_newconsole(); + DEBUGASSERT(pstate != NULL); + + dbg("Session [%d] Started\n", getpid()); + + /* Present a greeting */ + + fputs(g_nshgreeting, pstate->cn_outstream); + fflush(pstate->cn_outstream); + + /* Execute the startup script */ + +#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_CONSOLE) + (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 from the Telnet client */ + + if (fgets(pstate->cn_line, CONFIG_NSH_LINELEN, INSTREAM(pstate)) != NULL) + { + /* Parse process the received Telnet command */ + + (void)nsh_parse(&pstate->cn_vtbl, pstate->cn_line); + fflush(pstate->cn_outstream); + } + else + { + fprintf(pstate->cn_outstream, g_fmtcmdfailed, "fgets", NSH_ERRNO); + 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 */ - uip_server(HTONS(23), nsh_connection, CONFIG_NSH_STACKSIZE); return OK; } +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nsh_telnetstart + * + * Description: + * nsh_telnetstart() starts the Telnet daemon that will allow multiple + * NSH connections via Telnet. This function returns immediately after + * the daemon has been started. + * + * Input Parameters: + * None. All of the properties of the Telnet daemon are controlled by + * NuttX configuration setting. + * + * Returned Values: + * Zero if the Telnet daemon was successfully started. A negated errno + * value will be returned on failure. + * + ****************************************************************************/ + +int nsh_telnetstart(void) +{ + struct telnetd_config_s config; + int ret; + + /* Configure the telnet daemon */ + + config.d_port = HTONS(CONFIG_NSH_TELNETD_PORT); + config.d_priority = CONFIG_NSH_TELNETD_DAEMONPRIO; + config.d_stacksize = CONFIG_NSH_TELNETD_DAEMONSTACKSIZE; + config.t_priority = CONFIG_NSH_TELNETD_CLIENTPRIO; + config.t_stacksize = CONFIG_NSH_TELNETD_CLIENTSTACKSIZE; + config.t_entry = nsh_telnetmain; + + /* Start the telnet daemon */ + + vdbg("Starting the Telnet daemon\n"); + ret = telnetd_start(&config); + if (ret < 0) + { + dbg("Failed to tart the Telnet daemon: %d\n", ret); + } + + return ret; +} + #endif /* CONFIG_NSH_TELNET */ diff --git a/apps/nshlib/nsh_test.c b/apps/nshlib/nsh_test.c index dd63d6796b..6e1b65e5f4 100644 --- a/apps/nshlib/nsh_test.c +++ b/apps/nshlib/nsh_test.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/nsh_test.c * - * Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -69,6 +69,7 @@ #include #include "nsh.h" +#include "nsh_console.h" #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST) diff --git a/apps/nshlib/nsh_timcmds.c b/apps/nshlib/nsh_timcmds.c index 04a79e77d3..bc2bda6f4b 100644 --- a/apps/nshlib/nsh_timcmds.c +++ b/apps/nshlib/nsh_timcmds.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/nshlib/dbg_timcmds.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -45,6 +45,7 @@ #include #include "nsh.h" +#include "nsh_console.h" /**************************************************************************** * Definitions diff --git a/apps/nshlib/nsh_usbdev.c b/apps/nshlib/nsh_usbdev.c index bb17244c1a..c8115bfc71 100644 --- a/apps/nshlib/nsh_usbdev.c +++ b/apps/nshlib/nsh_usbdev.c @@ -146,4 +146,4 @@ int nsh_usbconsole(void) } #endif /* HAVE_USB_CONSOLE */ -#endif /* CONFIG_USBDEV */ \ No newline at end of file +#endif /* CONFIG_USBDEV */ diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile index 51bd9a6e32..974c989133 100644 --- a/apps/system/free/Makefile +++ b/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 . diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile index 5ea974452f..845c149f6c 100644 --- a/apps/system/i2c/Makefile +++ b/apps/system/i2c/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/system/i2c # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # 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)) diff --git a/apps/system/readline/Makefile b/apps/system/readline/Makefile index 3d9503cea1..34fab7e810 100644 --- a/apps/system/readline/Makefile +++ b/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 . diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index 73bb1bf658..c2bc61cbb6 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -8,7 +8,7 @@

NuttShell (NSH)

-

Last Updated: September 1, 2011

+

Last Updated: February 2, 2012

@@ -2131,13 +2131,6 @@ nsh> 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 @@ -2227,6 +2220,52 @@ nsh> +

+ If Telnet is selected for the NSH console, then we must configure + the resources used by the Telnet daemon and by the Telnet clients. +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
ConfigurationDescription
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 @@ -2457,7 +2496,6 @@ nsh>

  • CONFIG_NSH_ARCHROMFS
  • CONFIG_NSH_ROMFSMOUNTPT
  • CONFIG_NSH_ROMFSSECTSIZE
    • -
  • CONFIG_NSH_STACKSIZE
  • CONFIG_NSH_STRERROR
  • CONFIG_NSH_TELNET
  • Configuration settings
    • diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig index 862d079b96..3f8f8ce354 100644 --- a/nuttx/configs/amber/hello/defconfig +++ b/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 diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig index 3d2c5544f2..7b43524b2f 100755 --- a/nuttx/configs/avr32dev1/nsh/defconfig +++ b/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 diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index 668b2ec054..fd2f7e0735 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig index 66a070a0d3..3e993a2306 100644 --- a/nuttx/configs/c5471evm/httpd/defconfig +++ b/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) diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig index 6daa4309b7..3a3d4411ea 100644 --- a/nuttx/configs/c5471evm/nettest/defconfig +++ b/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) diff --git a/nuttx/configs/c5471evm/nsh/appconfig b/nuttx/configs/c5471evm/nsh/appconfig index c3dade0753..a2ec0db661 100644 --- a/nuttx/configs/c5471evm/nsh/appconfig +++ b/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 diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig index 8ad5bdce91..23fef3fd1a 100644 --- a/nuttx/configs/c5471evm/nsh/defconfig +++ b/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) diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig index fa0f15446e..2b2df80dc9 100644 --- a/nuttx/configs/c5471evm/ostest/defconfig +++ b/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) diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index fa7c36db93..52252cf3df 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig index fa09b56004..12ba1c799f 100644 --- a/nuttx/configs/ea3131/nsh/defconfig +++ b/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 diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig index cc4e8ddb61..67d422e5d5 100644 --- a/nuttx/configs/ea3131/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index da217f4d33..bec794719f 100644 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/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 diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig index 470df0d8a8..bdb7ea0559 100644 --- a/nuttx/configs/ea3131/usbserial/defconfig +++ b/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 diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig index f681f3f2a2..e9a4a5eb40 100644 --- a/nuttx/configs/ea3131/usbstorage/defconfig +++ b/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 diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig index 8a3dcb98a5..8a6d667255 100644 --- a/nuttx/configs/ea3152/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index 200b9006c7..74cb4ef5bf 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index 1f3e0ec5ce..a21a608cd7 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 400777d774..d44f5b4f32 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 712658716f..bc78a52918 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index 5cf69cf43c..91f6dca425 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 980211f1a6..2f53e4eb4c 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/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 diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig index e1a0ad5ef8..ab9f1f8cd9 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/defconfig +++ b/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 diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index dd3230e82d..e4c25f5995 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/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 diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig index 7b1961a354..7cfd0357da 100644 --- a/nuttx/configs/ez80f910200zco/httpd/defconfig +++ b/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 diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig index f2f267b926..97dc6836c5 100644 --- a/nuttx/configs/ez80f910200zco/nettest/defconfig +++ b/nuttx/configs/ez80f910200zco/nettest/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 diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig index 73393b56e0..580233bed9 100644 --- a/nuttx/configs/ez80f910200zco/nsh/defconfig +++ b/nuttx/configs/ez80f910200zco/nsh/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=2048 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig index 340ee9d423..6712b4bf56 100644 --- a/nuttx/configs/ez80f910200zco/ostest/defconfig +++ b/nuttx/configs/ez80f910200zco/ostest/defconfig @@ -650,7 +650,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 @@ -678,7 +677,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 diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig index d90836a171..6cb6fbdf1c 100644 --- a/nuttx/configs/ez80f910200zco/poll/defconfig +++ b/nuttx/configs/ez80f910200zco/poll/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 diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig index 811400e259..8a2bf3b07c 100644 --- a/nuttx/configs/hymini-stm32v/buttons/defconfig +++ b/nuttx/configs/hymini-stm32v/buttons/defconfig @@ -761,7 +761,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 @@ -792,7 +791,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 diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig index 2dddc77fed..9bc30fb120 100755 --- a/nuttx/configs/hymini-stm32v/nsh/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh/defconfig @@ -745,7 +745,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 @@ -777,7 +776,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index 897feeabff..8519a27fb8 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -869,7 +869,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 @@ -903,7 +902,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig index 48f1a866d9..272661e14a 100644 --- a/nuttx/configs/hymini-stm32v/nx/defconfig +++ b/nuttx/configs/hymini-stm32v/nx/defconfig @@ -913,7 +913,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 @@ -946,7 +945,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 diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig index e6b33fbced..9467ca1d2b 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/defconfig +++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig @@ -896,7 +896,6 @@ CONFIG_LCD_MAXCONTRAST=100 # 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 @@ -929,7 +928,6 @@ CONFIG_LCD_MAXCONTRAST=100 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 diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index d5ef2ffc48..a56197c5bb 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -806,7 +806,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 @@ -837,7 +836,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 diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig index e55183f54a..6ff131166f 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig +++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig @@ -753,7 +753,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 @@ -787,7 +786,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig index 3dec59521d..d759ab84f2 100755 --- a/nuttx/configs/kwikstik-k40/ostest/defconfig +++ b/nuttx/configs/kwikstik-k40/ostest/defconfig @@ -799,7 +799,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 @@ -830,7 +829,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 diff --git a/nuttx/configs/lm3s6432-s2e/nsh/appconfig b/nuttx/configs/lm3s6432-s2e/nsh/appconfig index 7d52c91a6f..74d29ef677 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/appconfig +++ b/nuttx/configs/lm3s6432-s2e/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 diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index bf609f55f9..3f0a256df4 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/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 diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig index b833876867..716a2c0a70 100644 --- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig +++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig @@ -519,7 +519,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 @@ -550,7 +549,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 diff --git a/nuttx/configs/lm3s6965-ek/nsh/appconfig b/nuttx/configs/lm3s6965-ek/nsh/appconfig index 4dbbc3bb75..6277056d00 100644 --- a/nuttx/configs/lm3s6965-ek/nsh/appconfig +++ b/nuttx/configs/lm3s6965-ek/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 diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 1572b14563..d8c8150b56 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/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 diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 2a8bb6e990..e5038a6303 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -643,7 +643,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 @@ -674,7 +673,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 diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index a9708b6608..eeb5f241dc 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -519,7 +519,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 @@ -550,7 +549,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 diff --git a/nuttx/configs/lm3s8962-ek/nsh/appconfig b/nuttx/configs/lm3s8962-ek/nsh/appconfig index 5268df2394..5eeb566076 100644 --- a/nuttx/configs/lm3s8962-ek/nsh/appconfig +++ b/nuttx/configs/lm3s8962-ek/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 diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index 4b4bbed6c2..766a411886 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/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 diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 0ccbe5e023..ce5db777d1 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -642,7 +642,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 @@ -673,7 +672,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 diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig index a2e7a03797..c5701f3d99 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/defconfig +++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig @@ -519,7 +519,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 @@ -550,7 +549,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 1b80f4ccf3..40d2c5b313 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -756,7 +756,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 @@ -787,7 +786,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig index b37487fd0f..1b4a2e23c2 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig index b6b438ae88..ca1539e6de 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -788,7 +788,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 @@ -819,7 +818,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index 6b584ab87d..d7ef4291db 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig @@ -876,7 +876,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 @@ -907,7 +906,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig index 1e42d60317..8f50ccd291 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig @@ -744,7 +744,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 @@ -775,7 +774,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig index ecfe5959a5..5c18ffcef0 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -843,7 +843,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 @@ -874,7 +873,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 diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig index f18ac3a2aa..73aa6105a7 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig @@ -733,7 +733,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 @@ -764,7 +763,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 diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index 2259d41b83..ac4df59953 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/configs/m68332evb/defconfig @@ -347,7 +347,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) diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index 71be225be2..332ddb9779 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/configs/mbed/hidkbd/defconfig @@ -775,7 +775,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 @@ -806,7 +805,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 diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index 6d23e1d193..0438f5e70e 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/configs/mbed/nsh/defconfig @@ -704,7 +704,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 @@ -735,7 +734,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 diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig index b08f203085..9ad8a8e2ba 100644 --- a/nuttx/configs/mcu123-lpc214x/composite/defconfig +++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig @@ -671,7 +671,6 @@ CONFIG_COMPOSITE_VERSIONNO=0x0101 # 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 @@ -701,7 +700,6 @@ CONFIG_COMPOSITE_VERSIONNO=0x0101 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 diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index c398546dff..5c4b847b1d 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -546,7 +546,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 @@ -577,7 +576,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 diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 1793d5d27e..923d1b39c7 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -536,7 +536,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 @@ -567,7 +566,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 diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index f7bc30d69c..1097121255 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -537,7 +537,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 @@ -568,7 +567,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 diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index 44dd15ff04..e7ebfb70be 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -537,7 +537,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 @@ -567,7 +566,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 diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig index ccd0f9d601..e3603ec147 100644 --- a/nuttx/configs/micropendous3/hello/defconfig +++ b/nuttx/configs/micropendous3/hello/defconfig @@ -652,7 +652,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 @@ -683,7 +682,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 diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig index b5f97c37c5..134896042b 100644 --- a/nuttx/configs/mx1ads/ostest/defconfig +++ b/nuttx/configs/mx1ads/ostest/defconfig @@ -525,7 +525,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) diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig index 32af8f7e69..7af1d943bf 100755 --- a/nuttx/configs/ne64badge/ostest/defconfig +++ b/nuttx/configs/ne64badge/ostest/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=512 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig index b8962b7394..973f54f7ac 100644 --- a/nuttx/configs/ntosd-dm320/nettest/defconfig +++ b/nuttx/configs/ntosd-dm320/nettest/defconfig @@ -521,7 +521,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) diff --git a/nuttx/configs/ntosd-dm320/nsh/appconfig b/nuttx/configs/ntosd-dm320/nsh/appconfig index 2c1a116c3f..21cbb63277 100644 --- a/nuttx/configs/ntosd-dm320/nsh/appconfig +++ b/nuttx/configs/ntosd-dm320/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 diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig index 3556438f3b..0af74e3f22 100644 --- a/nuttx/configs/ntosd-dm320/nsh/defconfig +++ b/nuttx/configs/ntosd-dm320/nsh/defconfig @@ -533,7 +533,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -561,7 +560,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig index a9790803ca..d61a8d1449 100644 --- a/nuttx/configs/ntosd-dm320/ostest/defconfig +++ b/nuttx/configs/ntosd-dm320/ostest/defconfig @@ -513,7 +513,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) diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig index c1e62fb1ba..b849e52400 100644 --- a/nuttx/configs/ntosd-dm320/poll/defconfig +++ b/nuttx/configs/ntosd-dm320/poll/defconfig @@ -528,7 +528,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) diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig index df4e96add4..9295faf438 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/defconfig +++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig @@ -657,7 +657,6 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) # 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_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) 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 @@ -698,7 +696,6 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_ARCHINIT=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) diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index 00aec20d6e..cc63323de9 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/configs/ntosd-dm320/udp/defconfig @@ -528,7 +528,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) diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig index 15d3d96482..8b4d65dcfe 100644 --- a/nuttx/configs/ntosd-dm320/uip/defconfig +++ b/nuttx/configs/ntosd-dm320/uip/defconfig @@ -529,7 +529,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) diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 3b3528b095..d9433e3c6b 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -769,7 +769,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 @@ -800,7 +799,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 diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 719adae7ea..c68dd09d0b 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -704,7 +704,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 @@ -735,7 +734,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 diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index 33b3e32bad..cdaf254e12 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -705,7 +705,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 @@ -736,7 +735,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 diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index fc16725f68..58a6d43286 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -705,7 +705,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 @@ -736,7 +735,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 diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig index e20ef94641..41b612b3ec 100644 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig @@ -50,3 +50,8 @@ CONFIGURED_APPS += netutils/ftpc # Optional networking support CONFIGURED_APPS += netutils/uiplib + +ifeq ($(CONFIG_NSH_TELNET),y) +CONFIGURED_APPS += netutils/telnetd +endif + diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig index d2949b9aa2..e8c79d23b0 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig @@ -950,7 +950,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -982,7 +981,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index 6d64decaec..0678befb4a 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -843,7 +843,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -874,7 +873,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index d3fb829d67..6ad668f45d 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -796,7 +796,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -827,7 +826,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig index e1a7d522c5..b535ca8696 100644 --- a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig +++ b/nuttx/configs/olimex-lpc1766stk/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 ifeq ($(CONFIG_ARCH_BUTTONS),y) diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index 157ccf08c6..899da216b2 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -891,7 +891,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -923,7 +922,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index b2bbd75d45..4ed0b2b168 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -952,7 +952,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -983,7 +982,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index 7925624e36..8b77fc1659 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -788,7 +788,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -819,7 +818,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index d6e9641813..b760229d30 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -903,7 +903,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -934,7 +933,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index 78411123f6..558c453087 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -895,7 +895,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -926,7 +925,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index 76aa55200f..07b371c417 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -788,7 +788,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -819,7 +818,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index 6df0b20d62..f1d070243a 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -788,7 +788,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" # 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 @@ -819,7 +818,6 @@ CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" 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 diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index 7f1ed86e6a..567796a6f7 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -828,7 +828,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 @@ -859,7 +858,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 diff --git a/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig index 561096828f..2b1e389c5b 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/defconfig +++ b/nuttx/configs/olimex-lpc2378/nsh/defconfig @@ -354,7 +354,6 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO= # 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 @@ -385,7 +384,6 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO= 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 diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig index f462c21d67..9384a18770 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/defconfig +++ b/nuttx/configs/olimex-lpc2378/ostest/defconfig @@ -354,7 +354,6 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO= # 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 @@ -385,7 +384,6 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO= 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 diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index abaf691953..2fd40f5cd6 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -664,7 +664,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=2048 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index 67b51d28ec..614a3151f9 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -599,7 +599,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 @@ -629,7 +628,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 diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index f8c43e1fae..6ffc704038 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -599,7 +599,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 @@ -630,7 +629,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 diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig index 8aa8adb9c8..a78f0eac05 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig @@ -788,7 +788,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 @@ -820,7 +819,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig index 9298dc4bd3..0e30a7fe8c 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig @@ -730,7 +730,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 @@ -761,7 +760,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 diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 5cb21d07c0..84de46d2cf 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -817,7 +817,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 @@ -848,7 +847,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 diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index 32341becbb..add9fa13dc 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/configs/pjrc-8051/defconfig @@ -345,7 +345,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) diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig index 890d82deaa..03d0351da6 100644 --- a/nuttx/configs/qemu-i486/nsh/defconfig +++ b/nuttx/configs/qemu-i486/nsh/defconfig @@ -450,7 +450,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096 # 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 @@ -481,7 +480,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096 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 diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index 8169746780..d5c1cc494c 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/configs/qemu-i486/ostest/defconfig @@ -366,7 +366,6 @@ CONFIG_NSH_CONSOLE=y CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 -CONFIG_NSH_STACKSIZE=2048 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) diff --git a/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig index 5723276e39..11819ec2fa 100644 --- a/nuttx/configs/rgmp/arm/default/defconfig +++ b/nuttx/configs/rgmp/arm/default/defconfig @@ -345,7 +345,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) diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig index 25c3ed3b4b..ec273ff19a 100644 --- a/nuttx/configs/rgmp/arm/nsh/defconfig +++ b/nuttx/configs/rgmp/arm/nsh/defconfig @@ -345,7 +345,6 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) # 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 @@ -375,7 +374,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=(192<<24|168<<16|10<<8|2) diff --git a/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig index 0e07b7f075..d0fb56f5d5 100644 --- a/nuttx/configs/rgmp/x86/default/defconfig +++ b/nuttx/configs/rgmp/x86/default/defconfig @@ -345,7 +345,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) diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig index 89bc466435..fce0c7c751 100644 --- a/nuttx/configs/rgmp/x86/nsh/defconfig +++ b/nuttx/configs/rgmp/x86/nsh/defconfig @@ -345,7 +345,6 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) # 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 @@ -375,7 +374,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=(192<<24|168<<16|10<<8|2) diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig index 1cc6d976f6..f415e355e2 100755 --- a/nuttx/configs/sam3u-ek/knsh/defconfig +++ b/nuttx/configs/sam3u-ek/knsh/defconfig @@ -775,7 +775,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 @@ -806,7 +805,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 diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 4c4ed90b29..5d184d11ee 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -745,7 +745,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 @@ -776,7 +775,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 diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 5f0fa1854e..d003a3850c 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -754,7 +754,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 @@ -785,7 +784,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 diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index a0610a66ff..23a9d0efa8 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -743,7 +743,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 @@ -774,7 +773,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 diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig index 75ecc55c72..a9ca4c4e9f 100755 --- a/nuttx/configs/sam3u-ek/touchscreen/defconfig +++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig @@ -798,7 +798,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 @@ -832,7 +831,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig index ee37111d4b..529e5f9cf0 100644 --- a/nuttx/configs/sim/mount/defconfig +++ b/nuttx/configs/sim/mount/defconfig @@ -342,7 +342,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) diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig index bb00f3f591..61d44376f3 100644 --- a/nuttx/configs/sim/nettest/defconfig +++ b/nuttx/configs/sim/nettest/defconfig @@ -342,7 +342,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) diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index 010e08c26f..c7f34c4eec 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -386,7 +386,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -414,7 +413,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig index 3140140441..0aca02af7a 100644 --- a/nuttx/configs/sim/nsh2/defconfig +++ b/nuttx/configs/sim/nsh2/defconfig @@ -571,7 +571,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -603,7 +602,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index e70163be70..ee89a97d75 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -438,7 +438,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -466,7 +465,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig index 420231d48e..26c26c60d6 100644 --- a/nuttx/configs/sim/nx11/defconfig +++ b/nuttx/configs/sim/nx11/defconfig @@ -444,7 +444,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -472,7 +471,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/sim/nxffs/defconfig b/nuttx/configs/sim/nxffs/defconfig index 2030608cd1..049ba42ba4 100644 --- a/nuttx/configs/sim/nxffs/defconfig +++ b/nuttx/configs/sim/nxffs/defconfig @@ -344,7 +344,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) diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig index df9bdf8258..a0ea71557e 100644 --- a/nuttx/configs/sim/ostest/defconfig +++ b/nuttx/configs/sim/ostest/defconfig @@ -342,7 +342,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) diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig index c00e25b15e..ec0aa67eb3 100644 --- a/nuttx/configs/sim/pashello/defconfig +++ b/nuttx/configs/sim/pashello/defconfig @@ -337,7 +337,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) diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig index 350502ef20..982bb29d14 100644 --- a/nuttx/configs/sim/touchscreen/defconfig +++ b/nuttx/configs/sim/touchscreen/defconfig @@ -445,7 +445,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # 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 @@ -473,7 +472,6 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=80 -CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index fca9dc7e1c..8f9c8b7efc 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/configs/skp16c26/ostest/defconfig @@ -516,7 +516,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) diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index f91c1c1451..e0e09ed9f2 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -751,7 +751,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 @@ -782,7 +781,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 diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig index ed0ffaacd8..53627e4916 100644 --- a/nuttx/configs/stm3210e-eval/buttons/defconfig +++ b/nuttx/configs/stm3210e-eval/buttons/defconfig @@ -786,7 +786,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 @@ -817,7 +816,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 diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index 7fb3b3ae81..e9fad97dc3 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -916,7 +916,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 @@ -950,7 +949,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 826e2ad52d..189cb005f4 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -770,7 +770,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 @@ -802,7 +801,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 2a97d499bd..369a1fcc81 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -1040,7 +1040,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 @@ -1074,7 +1073,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index 3378a4a24b..de6f046dfa 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -945,7 +945,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 @@ -978,7 +977,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 diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index e15782a914..167e0cb549 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig @@ -944,7 +944,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 @@ -977,7 +976,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 diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index 9484f3773c..fb77f70826 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig @@ -944,7 +944,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 @@ -977,7 +976,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 diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index a8d3bcb82d..508f9a9f07 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -787,7 +787,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 @@ -818,7 +817,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 diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index aa8f76adfd..7cfe310154 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -841,7 +841,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 @@ -872,7 +871,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 diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index 53f09060cd..326efcb4c2 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -777,7 +777,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 @@ -811,7 +810,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig index a0f42c3c81..8fe199c99f 100755 --- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig @@ -1120,7 +1120,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 @@ -1152,7 +1151,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig index 46b537bde4..efa32516ff 100755 --- a/nuttx/configs/stm3240g-eval/nettest/defconfig +++ b/nuttx/configs/stm3240g-eval/nettest/defconfig @@ -1113,7 +1113,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 @@ -1145,7 +1144,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm3240g-eval/nsh/appconfig b/nuttx/configs/stm3240g-eval/nsh/appconfig index a3bf2422c1..94f0c53f99 100644 --- a/nuttx/configs/stm3240g-eval/nsh/appconfig +++ b/nuttx/configs/stm3240g-eval/nsh/appconfig @@ -42,14 +42,19 @@ CONFIGURED_APPS += examples/nsh CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib -# Applications configured as an NX built-in commands +# Networking libraries ifeq ($(CONFIG_NET),y) CONFIGURED_APPS += netutils/uiplib CONFIGURED_APPS += netutils/resolv CONFIGURED_APPS += netutils/webclient CONFIGURED_APPS += netutils/tftpc +ifeq ($(CONFIG_NSH_TELNET),y) +CONFIGURED_APPS += netutils/telnetd endif +endif + +# Applications configured as an NX built-in commands ifeq ($(CONFIG_ADC),y) CONFIGURED_APPS += examples/adc diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 60b1204ef9..b63fa3d9e5 100755 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -1157,7 +1157,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 @@ -1189,7 +1188,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig index 52e2037985..2a5443bcb5 100755 --- a/nuttx/configs/stm3240g-eval/ostest/defconfig +++ b/nuttx/configs/stm3240g-eval/ostest/defconfig @@ -1110,7 +1110,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 @@ -1144,7 +1143,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig index b4fb21e68d..b1b3d806e1 100755 --- a/nuttx/configs/stm3240g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig @@ -1140,7 +1140,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 @@ -1172,7 +1171,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index bfa6f8df65..7bd0cec328 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -1111,7 +1111,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 @@ -1143,7 +1142,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig index c28ebaa61e..3d174535f6 100755 --- a/nuttx/configs/stm32f4discovery/ostest/defconfig +++ b/nuttx/configs/stm32f4discovery/ostest/defconfig @@ -1100,7 +1100,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 @@ -1134,7 +1133,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig index 7c40c0ee89..1f7400c379 100644 --- a/nuttx/configs/sure-pic32mx/nsh/defconfig +++ b/nuttx/configs/sure-pic32mx/nsh/defconfig @@ -861,7 +861,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 @@ -893,7 +892,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig index 63b4c4ed2e..b54151b80f 100644 --- a/nuttx/configs/sure-pic32mx/ostest/defconfig +++ b/nuttx/configs/sure-pic32mx/ostest/defconfig @@ -730,7 +730,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 @@ -761,7 +760,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 diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig index 99f7232e9a..cda9813aa4 100644 --- a/nuttx/configs/teensy/hello/defconfig +++ b/nuttx/configs/teensy/hello/defconfig @@ -652,7 +652,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 @@ -683,7 +682,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 diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig index 745860dfb4..4b9058ccd5 100755 --- a/nuttx/configs/teensy/nsh/defconfig +++ b/nuttx/configs/teensy/nsh/defconfig @@ -680,7 +680,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 @@ -711,7 +710,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=y CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig index c9521c3b7e..076281a60b 100755 --- a/nuttx/configs/teensy/usbstorage/defconfig +++ b/nuttx/configs/teensy/usbstorage/defconfig @@ -684,7 +684,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 @@ -715,7 +714,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=y CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig index 0dab4d4c6c..98f548a472 100644 --- a/nuttx/configs/twr-k60n512/nsh/defconfig +++ b/nuttx/configs/twr-k60n512/nsh/defconfig @@ -804,7 +804,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 @@ -836,7 +835,6 @@ CONFIG_NSH_BUILTIN_APPS=n 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 diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig index 4b2cf9a10a..e97b9d9d6c 100644 --- a/nuttx/configs/twr-k60n512/ostest/defconfig +++ b/nuttx/configs/twr-k60n512/ostest/defconfig @@ -799,7 +799,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 @@ -830,7 +829,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 diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index 76495ade01..2c8e4a2019 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -520,7 +520,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 @@ -548,7 +547,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 diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index 397a80690b..9203071a04 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -520,7 +520,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 @@ -548,7 +547,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 diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index f06b915657..9b32668556 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -765,7 +765,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 @@ -799,7 +798,6 @@ CONFIG_NSH_BUILTIN_APPS=y 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 diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index 12a73fe6e1..c7c4e48a78 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -341,7 +341,6 @@ CONFIG_NET_RESOLV_ENTRIES=4 # 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 @@ -369,7 +368,6 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=40 -CONFIG_NSH_STACKSIZE=1024 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index 974c2a7315..582caa1c70 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/configs/xtrs/ostest/defconfig @@ -341,7 +341,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) diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index 8a30014386..a05103b82c 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/configs/xtrs/pashello/defconfig @@ -341,7 +341,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) diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index 89e3d163d1..c8fb6d64d8 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig @@ -369,7 +369,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) diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig index 3c89dfc07a..d7639980fe 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/defconfig +++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig @@ -369,7 +369,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) diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index da704a791f..606bea4fe1 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -331,7 +331,6 @@ CONFIG_NET_RESOLV_ENTRIES=4 # 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 @@ -359,7 +358,6 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_STRERROR=n CONFIG_NSH_LINELEN=40 -CONFIG_NSH_STACKSIZE=1024 CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_DISABLESCRIPT=n CONFIG_NSH_DISABLEBG=n diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index e66e345915..e32d2612b6 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -331,7 +331,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) diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 2a39779194..533bc4f96c 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -331,7 +331,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) diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index d1cca6fe48..8caa8dfb4f 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/configs/z8encore000zco/ostest/defconfig @@ -370,7 +370,6 @@ CONFIG_NSH_CONSOLE=y CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 -CONFIG_NSH_STACKSIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig index 326e3e92d0..a5c501ec8b 100644 --- a/nuttx/configs/z8f64200100kit/ostest/defconfig +++ b/nuttx/configs/z8f64200100kit/ostest/defconfig @@ -370,7 +370,6 @@ CONFIG_NSH_CONSOLE=y CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 -CONFIG_NSH_STACKSIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)