Change all occurrences of NxConsole to NxTerm

2014-09-20 15:01:50 -06:00 · 2014-09-20 15:01:50 -06:00 · 0d4e873f9b
commit 0d4e873f9b
parent 4aa785a503
23 changed files with 54 additions and 54 deletions
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@ -647,7 +647,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NX is not set

 #
-# NxConsole Example
+# NxTerm Example
 #
 # CONFIG_EXAMPLES_NXTERM is not set

--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@ -798,7 +798,7 @@ CONFIG_NXFONT_SERIF22X28B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -808,7 +808,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 # CONFIG_NXTERM_NXKBDIN is not set
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@ -574,7 +574,7 @@ CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -584,7 +584,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@ -835,7 +835,7 @@ CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -845,7 +845,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
@ -1278,7 +1278,7 @@ CONFIG_NXWM_STARTWINDOW_PRIO=100
 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048

 #
-# NxConsole Window Settings
+# NxTerm Window Settings
 #
 CONFIG_NXWM_NXTERM=y
 CONFIG_NXWM_NXTERM_PRIO=100
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@ -688,7 +688,7 @@ CONFIG_NXFONT_SANS28X37B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -698,7 +698,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
@ -1093,7 +1093,7 @@ CONFIG_NXWM_STARTWINDOW_PRIO=100
 CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596

 #
-# NxConsole Window Settings
+# NxTerm Window Settings
 #
 CONFIG_NXWM_NXTERM=y
 CONFIG_NXWM_NXTERM_PRIO=100
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@ -4518,7 +4518,7 @@ Configurations

       - It boots into a graphic, window manage environment instead of
         the serial console command line.
-       - The console command line is still available within NxConsole
+       - The console command line is still available within NxTerm
         windows.
       - Obviously, the nx and touchscreen built in applications cannot
         be supported.
@ -4584,11 +4584,11 @@ Configurations

       Access to the NSH console is available in two ways:

-       a. The NxWM provides a graphics-based terminals (called NxConsoles);
-          The console command line is still available within NxConsole
+       a. The NxWM provides a graphics-based terminals (called NxTerms);
+          The console command line is still available within NxTerm
          windows once NxWM is up and running.  The console input (stdin) is
          provided via a USB HID keyboard, but console output will go to the
-          NxConsole terminal.  See below for more information about the USB
+          NxTerm terminal.  See below for more information about the USB
          HID keyboard input,

 |      b. Telnet NSH sessions are still supported and this is, in general,
@ -4596,7 +4596,7 @@ Configurations

       As with the NSH configuration, debug output will still go to the
       circular RAMLOG buffer but cannot be accessed from a serial console.
-       Instead, you will need use the dmesg command from an NxConsole or
+       Instead, you will need use the dmesg command from an NxTerm or
       from a Telnet session to see the debug output

    5. USB HID Keyboard Input
@ -4611,19 +4611,19 @@ Configurations

       The USB keyboard is configured to replace the NSH stdin device some
       that NSH will take input from the USB keyboard.  This has to be
-       done a little differently for the case of NxWM::CNxConsoles than
+       done a little differently for the case of NxWM::CNxTerms than
       in the standard NSH configuration.  Here the relevant configuration
       options are:

         CONFIG_NXWM_KEYBOARD_USBHOST=y
         CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/kbda"

-       NSH will then automatically start when the NxConsole is started:
+       NSH will then automatically start when the NxTerm is started:

         NuttShell (NSH) NuttX-7.3
         nsh>

-       When the NxConsole comes up, it will attempt to use /dev/kbda device
+       When the NxTerm comes up, it will attempt to use /dev/kbda device
       for input.  Obviously, you cannot enter text if there is no keyboard
       but otherwise you will not see any indication whether a keyboard is
       connected or not.
--- a/configs/sama5d4-ek/RunningNxWM.txt
+++ b/configs/sama5d4-ek/RunningNxWM.txt
@ -92,7 +92,7 @@ the following icons will be visible:

 1. Scales: This will perform touchscreen calibration again.

-2. NxConsole.  This is will bring up a graphics terminal running the
+2. NxTerm.  This is will bring up a graphics terminal running the
   NuttShell (NSH).  You interact with NSH using the attached USB
   keyboard.

--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@ -922,7 +922,7 @@ CONFIG_NXFONT_SANS28X37B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -932,7 +932,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
@ -1427,7 +1427,7 @@ CONFIG_NXWM_STARTWINDOW_PRIO=100
 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048

 #
-# NxConsole Window Settings
+# NxTerm Window Settings
 #
 CONFIG_NXWM_NXTERM=y
 CONFIG_NXWM_NXTERM_PRIO=100
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@ -737,7 +737,7 @@ CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -747,7 +747,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@ -580,7 +580,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NX is not set

 #
-# NxConsole Example
+# NxTerm Example
 #
 # CONFIG_EXAMPLES_NXTERM is not set

--- a/configs/sim/README.txt
+++ b/configs/sim/README.txt
@ -452,9 +452,9 @@ nx11
       CONFG_NX_MULTIUSER=y
       CONFIG_DISABLE_MQUEUE=n

-   6. apps/examples/nxconsole
+   6. apps/examples/nxterm

-      This configuration is also set up to use the apps/examples/nxconsole
+      This configuration is also set up to use the apps/examples/nxterm
      test instead of apps/examples/nx.  To enable this configuration,
      First, select Multi-User mode as described above.  Then add the
      following definitions to the defconfig file:
@ -501,7 +501,7 @@ nxwm

  1. There is an issue with running this example under the
     simulation.  In the default configuration, this example will
-     run the NxConsole example which waits on readline() for console
+     run the NxTerm example which waits on readline() for console
     input.  When it calls readline(), the whole system blocks
     waiting from input from the host OS.  So, in order to get
     this example to run, you must comment out the readline call in
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@ -370,7 +370,7 @@ CONFIG_NXFONT_SANS28X37B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=32
 CONFIG_NXTERM_CURSORCHAR=137
@ -380,7 +380,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 # CONFIG_NXTERM_NXKBDIN is not set
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@ -898,10 +898,10 @@ Where <subdir> is one of the following:
        c. Others could be similar configured:  apps/examples/nxhello,
            nximage, ...

-  nxconsole:
+  nxterm:
  ----------
    This is yet another NSH configuration.  This NSH configuration differs
-    from the other, however, in that it uses the NxConsole driver to host
+    from the other, however, in that it uses the NxTerm driver to host
    the NSH shell.

    NOTES:
@ -923,12 +923,12 @@ Where <subdir> is one of the following:
         CONFG_NX_MULTIUSER=y
         CONFIG_DISABLE_MQUEUE=n

-       The following definition in the defconfig file to enables the NxConsole
+       The following definition in the defconfig file to enables the NxTerm
       driver:

         CONFIG_NXTERM=y

-       And this selects apps/examples/nxconsole instead of apps/examples/nsh:
+       And this selects apps/examples/nxterm instead of apps/examples/nsh:

         CONFIG_EXAMPLES_NXTERM=y

--- a/configs/stm3210e-eval/nxconsole/Make.defs
+++ b/configs/stm3210e-eval/nxconsole/Make.defs
@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3210e-eval/nxconsole/Make.defs
+# configs/stm3210e-eval/nxterm/Make.defs
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@ -658,7 +658,7 @@ CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -668,7 +668,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 # CONFIG_NXTERM_NXKBDIN is not set
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/stm3210e-eval/nxconsole/setenv.sh
+++ b/configs/stm3210e-eval/nxconsole/setenv.sh
@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/stm3210e-eval/nxconsole/setenv.sh
+# configs/stm3210e-eval/nxterm/setenv.sh
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@ -791,7 +791,7 @@ CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -801,7 +801,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/stm3240g-eval/README.txt
+++ b/configs/stm3240g-eval/README.txt
@ -1003,8 +1003,8 @@ Where <subdir> is one of the following:
          top-level TODO file).  Without these NSH commands, there is no use
          for networking in this configuration.

-       b. The NxConsole windows are disabled. There are also issues with the
-          NxConsole build now (see the top-level TODO file).
+       b. The NxTerm windows are disabled. There are also issues with the
+          NxTerm build now (see the top-level TODO file).

       c. The initialization sequence is quite different:  NX and the
          touchscreen are initialized in kernel mode by logic in this src/
@ -1396,10 +1396,10 @@ Where <subdir> is one of the following:

       There is nothing in the DMA driver to prevent this now.

-  nxconsole:
+  nxterm:
  ----------
    This is yet another NSH configuration.  This NSH configuration differs
-    from the others, however, in that it uses the NxConsole driver to host
+    from the others, however, in that it uses the NxTerm driver to host
    the NSH shell.

    NOTES:
@ -1421,12 +1421,12 @@ Where <subdir> is one of the following:
         CONFG_NX_MULTIUSER=y
         CONFIG_DISABLE_MQUEUE=n

-       The following definition in the defconfig file to enables the NxConsole
+       The following definition in the defconfig file to enables the NxTerm
       driver:

         CONFIG_NXTERM=y

-       And this selects examples/nxconsole instead of examples/nsh:
+       And this selects examples/nxterm instead of examples/nsh:

         CONFIG_EXAMPLES_NXTERM=y

--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@ -1106,7 +1106,7 @@ CONFIG_NXWM_STARTWINDOW_PRIO=100
 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048

 #
-# NxConsole Window Settings
+# NxTerm Window Settings
 #
 # CONFIG_NXWM_NXTERM is not set

--- a/configs/stm3240g-eval/nxconsole/Make.defs
+++ b/configs/stm3240g-eval/nxconsole/Make.defs
@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3240g-eval/nxconsole/Make.defs
+# configs/stm3240g-eval/nxterm/Make.defs
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@ -764,7 +764,7 @@ CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -774,7 +774,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 # CONFIG_NXTERM_NXKBDIN is not set
 CONFIG_NXTERM_KBDBUFSIZE=16
--- a/configs/stm3240g-eval/nxconsole/setenv.sh
+++ b/configs/stm3240g-eval/nxconsole/setenv.sh
@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/stm3240g-eval/nxconsole/setenv.sh
+# configs/stm3240g-eval/nxterm/setenv.sh
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@ -786,7 +786,7 @@ CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXTERM=y

 #
-# NxConsole Output Text/Graphics Options
+# NxTerm Output Text/Graphics Options
 #
 CONFIG_NXTERM_BPP=16
 CONFIG_NXTERM_CURSORCHAR=137
@ -796,7 +796,7 @@ CONFIG_NXTERM_LINESEPARATION=0
 # CONFIG_NXTERM_NOWRAP is not set

 #
-# NxConsole Input options
+# NxTerm Input options
 #
 CONFIG_NXTERM_NXKBDIN=y
 CONFIG_NXTERM_KBDBUFSIZE=16