summaryrefslogtreecommitdiff
path: root/apps/nshlib/nsh_console.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-05-05 08:52:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-05-05 08:52:02 -0600
commit6029fd4a574baaaf8baef4fefa4d1ca5c082729f (patch)
tree5d9f3349abfe1fc99c96523cbb77d0ba9140d4bf /apps/nshlib/nsh_console.c
parent52cc0b12520c403609e3e32e3e5e07e12c5f9e3b (diff)
downloadnuttx-6029fd4a574baaaf8baef4fefa4d1ca5c082729f.tar.gz
nuttx-6029fd4a574baaaf8baef4fefa4d1ca5c082729f.tar.bz2
nuttx-6029fd4a574baaaf8baef4fefa4d1ca5c082729f.zip
The alternate console device CONFIG_NSH_CONDEV must not be defined unconditionally. This causes errors when using Telnet sessions. This was solved by adding CONFIG_NSH_ALTCONDEV: CONFIG_NSH_ALTCONDEV enables or disables the feature then, if enabled, CONFIG_NSH_CONDEV provides the alternative console device name
Diffstat (limited to 'apps/nshlib/nsh_console.c')
-rw-r--r--apps/nshlib/nsh_console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index ba7dbe760..9b78258c4 100644
--- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c
@@ -312,7 +312,7 @@ static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl)
/* Close the console stream */
-#ifdef CONFIG_NSH_CONDEV
+#ifdef CONFIG_NSH_ALTCONDEV
(void)fclose(pstate->cn_constream);
#endif
#endif
@@ -462,7 +462,7 @@ FAR struct console_stdio_s *nsh_newconsole(void)
/* (Re-) open the console input device */
-#ifdef CONFIG_NSH_CONDEV
+#ifdef CONFIG_NSH_ALTCONDEV
pstate->cn_confd = open(CONFIG_NSH_CONDEV, O_RDWR);
if (pstate->cn_confd < 0)
{