From fefc4f624bcc4ce7324d1ee42ca4a840ea9eacb1 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 20 Sep 2014 15:01:50 -0600 Subject: [PATCH] Change all occurrences of NxConsole to NxTerm --- Documentation/NXGraphicsSubsystem.html | 38 +++++++++---------- TODO | 20 +++++----- configs/fire-stm32v2/nsh/defconfig | 2 +- configs/mikroe-stm32f4/fulldemo/defconfig | 4 +- configs/sam3u-ek/nxwm/defconfig | 4 +- configs/sam4e-ek/nxwm/defconfig | 6 +-- configs/sama5d3x-ek/nxwm/defconfig | 6 +-- configs/sama5d4-ek/README.txt | 16 ++++---- configs/sama5d4-ek/RunningNxWM.txt | 2 +- configs/sama5d4-ek/nxwm/defconfig | 6 +-- configs/shenzhou/nxwm/defconfig | 4 +- configs/shenzhou/thttpd/defconfig | 2 +- configs/sim/README.txt | 6 +-- configs/sim/nxwm/defconfig | 4 +- configs/stm3210e-eval/README.txt | 8 ++-- .../{nxconsole => nxterm}/Make.defs | 2 +- .../{nxconsole => nxterm}/defconfig | 4 +- .../{nxconsole => nxterm}/setenv.sh | 2 +- configs/stm3220g-eval/nxwm/defconfig | 4 +- configs/stm3240g-eval/README.txt | 12 +++--- configs/stm3240g-eval/knxwm/defconfig | 2 +- .../{nxconsole => nxterm}/Make.defs | 2 +- .../{nxconsole => nxterm}/defconfig | 4 +- .../{nxconsole => nxterm}/setenv.sh | 2 +- configs/stm3240g-eval/nxwm/defconfig | 4 +- graphics/Kconfig | 20 +++++----- graphics/Makefile | 10 ++--- graphics/README.txt | 24 ++++++------ graphics/{nxconsole => nxterm}/Make.defs | 2 +- graphics/{nxconsole => nxterm}/nx_register.c | 8 ++-- graphics/{nxconsole => nxterm}/nxcon_driver.c | 2 +- graphics/{nxconsole => nxterm}/nxcon_font.c | 2 +- .../{nxconsole => nxterm}/nxcon_internal.h | 14 +++---- graphics/{nxconsole => nxterm}/nxcon_kbdin.c | 14 +++---- graphics/{nxconsole => nxterm}/nxcon_putc.c | 2 +- graphics/{nxconsole => nxterm}/nxcon_redraw.c | 4 +- .../{nxconsole => nxterm}/nxcon_register.c | 6 +-- graphics/{nxconsole => nxterm}/nxcon_scroll.c | 2 +- graphics/{nxconsole => nxterm}/nxcon_sem.c | 2 +- .../{nxconsole => nxterm}/nxcon_unregister.c | 6 +-- graphics/{nxconsole => nxterm}/nxcon_vt100.c | 2 +- .../{nxconsole => nxterm}/nxtk_register.c | 8 ++-- .../{nxconsole => nxterm}/nxtool_register.c | 8 ++-- include/nuttx/nx/{nxconsole.h => nxterm.h} | 38 +++++++++---------- 44 files changed, 170 insertions(+), 170 deletions(-) rename configs/stm3210e-eval/{nxconsole => nxterm}/Make.defs (99%) rename configs/stm3210e-eval/{nxconsole => nxterm}/defconfig (99%) rename configs/stm3210e-eval/{nxconsole => nxterm}/setenv.sh (98%) rename configs/stm3240g-eval/{nxconsole => nxterm}/Make.defs (98%) rename configs/stm3240g-eval/{nxconsole => nxterm}/defconfig (99%) rename configs/stm3240g-eval/{nxconsole => nxterm}/setenv.sh (98%) rename graphics/{nxconsole => nxterm}/Make.defs (98%) rename graphics/{nxconsole => nxterm}/nx_register.c (97%) rename graphics/{nxconsole => nxterm}/nxcon_driver.c (99%) rename graphics/{nxconsole => nxterm}/nxcon_font.c (99%) rename graphics/{nxconsole => nxterm}/nxcon_internal.h (96%) rename graphics/{nxconsole => nxterm}/nxcon_kbdin.c (96%) rename graphics/{nxconsole => nxterm}/nxcon_putc.c (99%) rename graphics/{nxconsole => nxterm}/nxcon_redraw.c (97%) rename graphics/{nxconsole => nxterm}/nxcon_register.c (97%) rename graphics/{nxconsole => nxterm}/nxcon_scroll.c (99%) rename graphics/{nxconsole => nxterm}/nxcon_sem.c (99%) rename graphics/{nxconsole => nxterm}/nxcon_unregister.c (97%) rename graphics/{nxconsole => nxterm}/nxcon_vt100.c (99%) rename graphics/{nxconsole => nxterm}/nxtk_register.c (96%) rename graphics/{nxconsole => nxterm}/nxtool_register.c (96%) rename include/nuttx/nx/{nxconsole.h => nxterm.h} (91%) diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 8fd35408cc..99b7134283 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -45,7 +45,7 @@ 1.3.3 NX Tool Kit (NXTK)
1.3.4 NX Fonts Support (NXFONTS)
1.3.5 NX Widgets (NxWidgets)
- 1.3.6 NX Console Driver (NxConsole) + 1.3.6 NX Terminal Driver (NxTerm)

@@ -191,7 +191,7 @@ B.4 NX Multi-User (Only) Configuration Settings
B.5 NXTK Configuration Settings
B.6 NXFONTS Configuration Settings
- B.7 NxConsole Configuration Settings + B.7 NxTerm Configuration Settings

@@ -403,12 +403,12 @@ NxWidgets is built on top of the core NuttX graphics subsystem, but is not a part of the core graphics subystems.

-

1.3.6 NX Console Driver (NxConsole)

+

1.3.6 NX Terminal Driver (NxTerm)

- NxConsole is a write-only character device (not shown) that is built on top of an NX window. + NxTerm is a write-only character device (not shown) that is built on top of an NX window. This character device can be used to provide stdout and stderr and, hence, can provide the output side of NuttX console. - NxConsole is only available when the multi-user NX implementation is selected (CONFIG_NX_MULTIUSER). + NxTerm is only available when the multi-user NX implementation is selected (CONFIG_NX_MULTIUSER).

@@ -3204,9 +3204,9 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
nuttx/../nxwidgets
The NxWidgets code is provided as a separate package located outside of the NuttX source tree (probably at this location). -
graphics/nxconsole -
The NxConsole driver is built on top of NX and works with either the single-user or multi-user NX version. - See include/nuttx/nx/nxconsole.h. +
graphics/nxterm +
The NxTerm driver is built on top of NX and works with either the single-user or multi-user NX version. + See include/nuttx/nx/nxterm.h.

1There is no nxsu sub-directory in nuttx/libnx. @@ -3370,32 +3370,32 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, -

B.7 NxConsole Configuration Settings

+

B.7 NxTerm Configuration Settings

-

General NxConsole settings.

+

General NxTerm settings.

    CONFIG_NXTERM: -
    Enables building of the NxConsole driver. +
    Enables building of the NxTerm driver.
-

NxConsole output text/graphics options:

+

NxTerm output text/graphics options:

    CONFIG_NXTERM_BPP: -
    Currently, NxConsole supports only a single pixel depth. +
    Currently, NxTerm supports only a single pixel depth. This configuration setting must be provided to support that single pixel depth. Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP)
    CONFIG_NXTERM_CURSORCHAR:
    The bitmap code to use as the cursor. Default '_'
    CONFIG_NXTERM_MXCHARS: -
    NxConsole needs to remember every character written to the console so that it can redraw the window. +
    NxTerm needs to remember every character written to the console so that it can redraw the window. This setting determines the size of some internal memory allocations used to hold the character data. Default: 128.
    CONFIG_NXTERM_CACHESIZE:
    - NxConsole supports caching of rendered fonts. + NxTerm supports caching of rendered fonts. This font caching is required for two reasons: (1) First, it improves text performance, but more importantly (2) it preserves the font memory. @@ -3405,11 +3405,11 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, Only that number of the most recently used glyphs will be retained. Default: 16.
    - NOTE: There can still be a race condition between the NxConsole driver and the + NOTE: There can still be a race condition between the NxTerm driver and the NX task. If you every see character corruption (especially when printing a lot of data or scrolling), then increasing the value of CONFIG_NXTERM_CACHESIZE is something that you should try. - Alternatively, you can reduce the size of CONFIG_MQ_MAXMSGSIZE which will force NxConsole task to pace the server task. + Alternatively, you can reduce the size of CONFIG_MQ_MAXMSGSIZE which will force NxTerm task to pace the server task. CONFIG_NXTERM_CACHESIZE should be larger than CONFIG_MQ_MAXMSGSIZE in any event.
    CONFIG_NXTERM_LINESEPARATION: @@ -3420,7 +3420,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
-

NxConsole input options:

+

NxTerm input options:

    CONFIG_NXTERM_NXKBDIN: @@ -3428,7 +3428,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, By default, keyboard input is taken from stdin (/dev/console). If this option is set, then the interfacenxcon_kdbin() is enabled. That interface may be driven by window callback functions so that keyboard input only goes to the top window. -
    CONFIG__NXCONSOLE_KBDBUFSIZE: +
    CONFIG__NXTERM_KBDBUFSIZE:
    If CONFIG_NXTERM_NXKBDIN is enabled, then this value may be used to define the size of the per-window keyboard input buffer. Default: 16
    CONFIG_NXTERM_NPOLLWAITERS: diff --git a/TODO b/TODO index f4fd24fe4d..72f2eeb0f2 100644 --- a/TODO +++ b/TODO @@ -371,11 +371,11 @@ o Kernel/Protected Build Status: Open Priority: Medium - Title: NxCONSOLE PARTITIONING. - Description: NxConsole is implemented (correctly) as a driver that resides + Title: NxTERM PARTITIONING. + Description: NxTerm is implemented (correctly) as a driver that resides in the nuttx/ directory. However, the user interfaces must be moved into a NuttX library or into apps/. Currently - applications calls to the NxConsole user interfaces are + applications calls to the NxTerm user interfaces are undefined. Status: Open Priority: Medium @@ -1226,20 +1226,20 @@ o Graphics subystem (graphics/) Status: Open Priority: Medium low - Title: IMPROVED NXCONSOLE FONT CACHING - Description: Now each NxConsole instance has its own private font cache + Title: IMPROVED NxTERM FONT CACHING + Description: Now each NxTerm instance has its own private font cache whose size is determined by CONFIG_NXTERM_MXCHARS. If there - are multiple NxConsole instances using the same font, each will + are multiple NxTerm instances using the same font, each will have a separate font cache. This is inefficient and wasteful - of memory: Each NxConsole instance should share a common font + of memory: Each NxTerm instance should share a common font cache. Status: Open Priority: Medium. Not important for day-to-day testing but would be - a critical improvement if NxConsole were to be used in a + a critical improvement if NxTerm were to be used in a product. - Title: NXCONSOLE VT100 SUPPORT - Description: If the NxConsole will be used with the Emacs-like command line + Title: NxTERM VT100 SUPPORT + Description: If the NxTerm will be used with the Emacs-like command line editor (CLE), then it will need to support VT100 cursor control commands. Status: Open diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index 9cb9912a8f..f66a8d7e3e 100644 --- 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 diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index d52a337ef8..33e65a3e56 100644 --- 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 diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index fc22a6bda5..b573424734 100644 --- 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 diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index 9fe2eeb2ed..7684a0798b 100644 --- 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 diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index f6ee6c3767..3cdd1ffbf6 100644 --- 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 diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 771c3b6da4..9419cc6a59 100644 --- 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. diff --git a/configs/sama5d4-ek/RunningNxWM.txt b/configs/sama5d4-ek/RunningNxWM.txt index ae5541a846..a10660a65f 100644 --- 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. diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 2a839aa056..31a7209baf 100644 --- 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 diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 53e6373762..09f8babd35 100644 --- 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 diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index 89cae9cc4b..cdced2b968 100644 --- 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 diff --git a/configs/sim/README.txt b/configs/sim/README.txt index dec1ff4055..d2b544e324 100644 --- 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 diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig index d67aea20c1..a9731b3016 100644 --- 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 diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index 757cb20fd8..c9baf20e22 100644 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -898,10 +898,10 @@ Where 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 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 diff --git a/configs/stm3210e-eval/nxconsole/Make.defs b/configs/stm3210e-eval/nxterm/Make.defs similarity index 99% rename from configs/stm3210e-eval/nxconsole/Make.defs rename to configs/stm3210e-eval/nxterm/Make.defs index 923601e617..e667e64666 100644 --- a/configs/stm3210e-eval/nxconsole/Make.defs +++ b/configs/stm3210e-eval/nxterm/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 diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxterm/defconfig similarity index 99% rename from configs/stm3210e-eval/nxconsole/defconfig rename to configs/stm3210e-eval/nxterm/defconfig index 3ee3b99f88..122b1b8b92 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxterm/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 diff --git a/configs/stm3210e-eval/nxconsole/setenv.sh b/configs/stm3210e-eval/nxterm/setenv.sh similarity index 98% rename from configs/stm3210e-eval/nxconsole/setenv.sh rename to configs/stm3210e-eval/nxterm/setenv.sh index b0d409c60e..0777732c22 100755 --- a/configs/stm3210e-eval/nxconsole/setenv.sh +++ b/configs/stm3210e-eval/nxterm/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 diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index e86dccabe4..8949b32360 100644 --- 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 diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index eebc5cb607..b7e7bf94a5 100644 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -1003,8 +1003,8 @@ Where 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 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 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 diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 052d479286..2150ab4bac 100644 --- 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 diff --git a/configs/stm3240g-eval/nxconsole/Make.defs b/configs/stm3240g-eval/nxterm/Make.defs similarity index 98% rename from configs/stm3240g-eval/nxconsole/Make.defs rename to configs/stm3240g-eval/nxterm/Make.defs index 2782c6255c..7b09af2c8e 100644 --- a/configs/stm3240g-eval/nxconsole/Make.defs +++ b/configs/stm3240g-eval/nxterm/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 diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxterm/defconfig similarity index 99% rename from configs/stm3240g-eval/nxconsole/defconfig rename to configs/stm3240g-eval/nxterm/defconfig index 361ef67cba..3d0b816e00 100644 --- a/configs/stm3240g-eval/nxconsole/defconfig +++ b/configs/stm3240g-eval/nxterm/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 diff --git a/configs/stm3240g-eval/nxconsole/setenv.sh b/configs/stm3240g-eval/nxterm/setenv.sh similarity index 98% rename from configs/stm3240g-eval/nxconsole/setenv.sh rename to configs/stm3240g-eval/nxterm/setenv.sh index 39c9d257bb..ca324941c4 100755 --- a/configs/stm3240g-eval/nxconsole/setenv.sh +++ b/configs/stm3240g-eval/nxterm/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 diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index 6167f23faf..2b1dd8ea00 100644 --- 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 diff --git a/graphics/Kconfig b/graphics/Kconfig index 83c62b454a..0b21d997a3 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -358,17 +358,17 @@ config NXFONT_SERIF38X49B endmenu menuconfig NXTERM - bool "NxConsole" + bool "NxTerm" default n ---help--- - Enables building of the NxConsole driver. + Enables building of the NxTerm driver. if NXTERM -comment "NxConsole Output Text/Graphics Options" +comment "NxTerm Output Text/Graphics Options" config NXTERM_BPP - int "NxConsole BPP" + int "NxTerm BPP" default 1 if !NX_DISABLE_1BPP default 2 if !NX_DISABLE_2BPP default 4 if !NX_DISABLE_4BPP @@ -377,7 +377,7 @@ config NXTERM_BPP default 24 if !NX_DISABLE_24BPP default 32 if !NX_DISABLE_32BPP ---help--- - Currently, NxConsole supports only a single pixel depth. This + Currently, NxTerm supports only a single pixel depth. This configuration setting must be provided to support that single pixel depth. Default: The smallest enabled pixel depth. (see NX_DISABLE_*BPP) @@ -391,7 +391,7 @@ config NXTERM_MXCHARS int "Max Characters on Display" default 128 ---help--- - NxConsole needs to remember every character written to the console so + NxTerm needs to remember every character written to the console so that it can redraw the window. This setting determines the size of some internal memory allocations used to hold the character data. Default: 128. @@ -399,7 +399,7 @@ config NXTERM_CACHESIZE int "Font Cache Size" default 16 ---help--- - NxConsole supports caching of rendered fonts. This font caching is required + NxTerm supports caching of rendered fonts. This font caching is required for two reasons: (1) First, it improves text performance, but more importantly (2) it preserves the font memory. Since the NX server runs on a separate server thread, it requires that the rendered font memory persist @@ -407,11 +407,11 @@ config NXTERM_CACHESIZE cache would be quite large if all fonts were saved. The NXTERM_CACHESIZE setting will control the size of the font cache (in number of glyphs). Only that number of the most recently used glyphs will be retained. Default: 16. - NOTE: There can still be a race condition between the NxConsole driver and the + NOTE: There can still be a race condition between the NxTerm driver and the NX task. If you every see character corruption (especially when printing a lot of data or scrolling), then increasing the value of NXTERM_CACHESIZE is something that you should try. Alternatively, you can reduce the size of - MQ_MAXMSGSIZE which will force NxConsole task to pace the server task. + MQ_MAXMSGSIZE which will force NxTerm task to pace the server task. NXTERM_CACHESIZE should be larger than MQ_MAXMSGSIZE in any event. config NXTERM_LINESEPARATION @@ -428,7 +428,7 @@ config NXTERM_NOWRAP of the window. This setting can be defining to change this behavior so that the text is simply truncated until a new line is encountered. -comment "NxConsole Input options" +comment "NxTerm Input options" config NXTERM_NXKBDIN bool "NX KBD input" diff --git a/graphics/Makefile b/graphics/Makefile index 368f236e37..c66f68a1b3 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -60,9 +60,9 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxsu} endif ifeq ($(CONFIG_NXTERM),y) -include nxconsole/Make.defs -DEPPATH += --dep-path nxconsole -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxconsole} +include nxterm/Make.defs +DEPPATH += --dep-path nxterm +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm} endif ASRCS = $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXCON_ASRCS) @@ -77,9 +77,9 @@ OBJS = $(AOBJS) $(COBJS) BIN = libgraphics$(LIBEXT) ifeq ($(CONFIG_NX_MULTIUSER),y) -VPATH = nxglib:nxbe:nxmu:nxconsole +VPATH = nxglib:nxbe:nxmu:nxterm else -VPATH = nxglib:nxbe:nxsu:nxconsole +VPATH = nxglib:nxbe:nxsu:nxterm endif all: mklibgraphics diff --git a/graphics/README.txt b/graphics/README.txt index e025808eef..cfc0e42de7 100644 --- a/graphics/README.txt +++ b/graphics/README.txt @@ -34,10 +34,10 @@ at the present, but here is the longer term roadmap: and without NXTOOLKIT for raw access to window memory. NXGLIB - Low level graphics utilities and direct framebuffer rendering logic. NX is built on top of NXGLIB. - NxConsole - NxConsole is a write-only character device that is built on top of + NxTerm - NxTerm is a write-only character device that is built on top of an NX window. This character device can be used to provide stdout and stderr and, hence, can provide the output side of NuttX console. - NxConsole is only available when the multi-user NX implementation is + NxTerm is only available when the multi-user NX implementation is selected (CONFIG_NX_MULTIUSERs). @@ -351,26 +351,26 @@ CONFIG_NXFONT_SERIF38X49B This option enables support for a large, 38x49 bold font (with serifs) (font ID FONTID_SERIF38X49B == 13). -NxConsole Configuration Settings +NxTerm Configuration Settings -------------------------------- CONFIG_NXTERM - Enables building of the NxConsole driver. + Enables building of the NxTerm driver. -NxConsole output text/graphics options: +NxTerm output text/graphics options: CONFIG_NXTERM_BPP - Currently, NxConsole supports only a single pixel depth. This + Currently, NxTerm supports only a single pixel depth. This configuration setting must be provided to support that single pixel depth. Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) CONFIG_NXTERM_CURSORCHAR The bitmap code to use as the cursor. Default '_' CONFIG_NXTERM_MXCHARS - NxConsole needs to remember every character written to the console so + NxTerm needs to remember every character written to the console so that it can redraw the window. This setting determines the size of some internal memory allocations used to hold the character data. Default: 128. CONFIG_NXTERM_CACHESIZE - NxConsole supports caching of rendered fonts. This font caching is required + NxTerm supports caching of rendered fonts. This font caching is required for two reasons: (1) First, it improves text performance, but more importantly (2) it preserves the font memory. Since the NX server runs on a separate server thread, it requires that the rendered font memory persist @@ -378,11 +378,11 @@ CONFIG_NXTERM_CACHESIZE cache would be quite large if all fonts were saved. The CONFIG_NXTERM_CACHESIZE setting will control the size of the font cache (in number of glyphs). Only that number of the most recently used glyphs will be retained. Default: 16. - NOTE: There can still be a race condition between the NxConsole driver and the + NOTE: There can still be a race condition between the NxTerm driver and the NX task. If you every see character corruption (especially when printing a lot of data or scrolling), then increasing the value of CONFIG_NXTERM_CACHESIZE is something that you should try. Alternatively, you can reduce the size of - CONFIG_MQ_MAXMSGSIZE which will force NxConsole task to pace the server task. + CONFIG_MQ_MAXMSGSIZE which will force NxTerm task to pace the server task. CONFIG_NXTERM_CACHESIZE should be larger than CONFIG_MQ_MAXMSGSIZE in any event. CONFIG_NXTERM_LINESEPARATION This the space (in rows) between each row of test. Default: 0 @@ -391,7 +391,7 @@ CONFIG_NXTERM_NOWRAP of the window. This setting can be defining to change this behavior so that the text is simply truncated until a new line is encountered. -NxConsole Input options +NxTerm Input options CONFIG_NXTERM_NXKBDIN Take input from the NX keyboard input callback. By default, keyboard @@ -399,7 +399,7 @@ CONFIG_NXTERM_NXKBDIN the interface nxcon_kdbin() is enabled. That interface may be driven by window callback functions so that keyboard input *only* goes to the top window. -CONFIG__NXCONSOLE_KBDBUFSIZE +CONFIG__NXTERM_KBDBUFSIZE If CONFIG_NXTERM_NXKBDIN is enabled, then this value may be used to define the size of the per-window keyboard input buffer. Default: 16 CONFIG_NXTERM_NPOLLWAITERS diff --git a/graphics/nxconsole/Make.defs b/graphics/nxterm/Make.defs similarity index 98% rename from graphics/nxconsole/Make.defs rename to graphics/nxterm/Make.defs index 3dc9c79a19..7a44ba2635 100644 --- a/graphics/nxconsole/Make.defs +++ b/graphics/nxterm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# graphics/nxconsole/Make.defs +# graphics/nxterm/Make.defs # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/nxconsole/nx_register.c b/graphics/nxterm/nx_register.c similarity index 97% rename from graphics/nxconsole/nx_register.c rename to graphics/nxterm/nx_register.c index 64eb878d91..ed84d3d289 100644 --- a/graphics/nxconsole/nx_register.c +++ b/graphics/nxterm/nx_register.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nx_register.c + * nuttx/graphics/nxterm/nx_register.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include +#include #include "nxcon_internal.h" @@ -186,8 +186,8 @@ static int nxcon_bitmap(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -NXCONSOLE nx_register(NXWINDOW hwnd, FAR struct nxcon_window_s *wndo, int minor) +NXTERM nx_register(NXWINDOW hwnd, FAR struct nxcon_window_s *wndo, int minor) { - return nxcon_register((NXCONSOLE)hwnd, wndo, &g_nxops, minor); + return nxcon_register((NXTERM)hwnd, wndo, &g_nxops, minor); } diff --git a/graphics/nxconsole/nxcon_driver.c b/graphics/nxterm/nxcon_driver.c similarity index 99% rename from graphics/nxconsole/nxcon_driver.c rename to graphics/nxterm/nxcon_driver.c index 0fa6f74000..5132183b22 100644 --- a/graphics/nxconsole/nxcon_driver.c +++ b/graphics/nxterm/nxcon_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_driver.c + * nuttx/graphics/nxterm/nxcon_driver.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxcon_font.c b/graphics/nxterm/nxcon_font.c similarity index 99% rename from graphics/nxconsole/nxcon_font.c rename to graphics/nxterm/nxcon_font.c index 5d44af36aa..310985ec44 100644 --- a/graphics/nxconsole/nxcon_font.c +++ b/graphics/nxterm/nxcon_font.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_font.c + * nuttx/graphics/nxterm/nxcon_font.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxcon_internal.h b/graphics/nxterm/nxcon_internal.h similarity index 96% rename from graphics/nxconsole/nxcon_internal.h rename to graphics/nxterm/nxcon_internal.h index 1f66c119ba..9bee64c3e4 100644 --- a/graphics/nxconsole/nxcon_internal.h +++ b/graphics/nxterm/nxcon_internal.h @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_internal.h + * nuttx/graphics/nxterm/nxcon_internal.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __GRAPHICS_NXCONSOLE_NXCON_INTERNAL_H -#define __GRAPHICS_NXCONSOLE_NXCON_INTERNAL_H +#ifndef __GRAPHICS_NXTERM_NXCON_INTERNAL_H +#define __GRAPHICS_NXTERM_NXCON_INTERNAL_H /**************************************************************************** * Included Files @@ -50,12 +50,12 @@ #include #include #include -#include +#include /**************************************************************************** * Definitions ****************************************************************************/ -/* NxConsole Definitions ****************************************************/ +/* NxTerm Definitions ****************************************************/ /* Bitmap flags */ #define BMFLAGS_NOGLYPH (1 << 0) /* No glyph available, use space */ @@ -216,7 +216,7 @@ int nxcon_sempost(FAR struct nxcon_state_s *priv); /* Common device registration */ -FAR struct nxcon_state_s *nxcon_register(NXCONSOLE handle, +FAR struct nxcon_state_s *nxcon_register(NXTERM handle, FAR struct nxcon_window_s *wndo, FAR const struct nxcon_operations_s *ops, int minor); @@ -251,4 +251,4 @@ void nxcon_hidecursor(FAR struct nxcon_state_s *priv); void nxcon_scroll(FAR struct nxcon_state_s *priv, int scrollheight); -#endif /* __GRAPHICS_NXCONSOLE_NXCON_INTERNAL_H */ +#endif /* __GRAPHICS_NXTERM_NXCON_INTERNAL_H */ diff --git a/graphics/nxconsole/nxcon_kbdin.c b/graphics/nxterm/nxcon_kbdin.c similarity index 96% rename from graphics/nxconsole/nxcon_kbdin.c rename to graphics/nxterm/nxcon_kbdin.c index fa7990a71f..4cac68edf0 100644 --- a/graphics/nxconsole/nxcon_kbdin.c +++ b/graphics/nxterm/nxcon_kbdin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_kbdin.c + * nuttx/graphics/nxterm/nxcon_kbdin.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -106,7 +106,7 @@ static void nxcon_pollnotify(FAR struct nxcon_state_s *priv, pollevent_t eventse * Name: nxcon_read * * Description: - * The optional NxConsole read method + * The optional NxTerm read method * ****************************************************************************/ @@ -373,15 +373,15 @@ errout: * * Description: * This function should be driven by the window kbdin callback function - * (see nx.h). When the NxConsole is the top window and keyboard input is + * (see nx.h). When the NxTerm is the top window and keyboard input is * received on the top window, that window callback should be directed to * this function. This function will buffer the keyboard data and makE - * it available to the NxConsole as stdin. + * it available to the NxTerm as stdin. * - * If CONFIG_NXTERM_NXKBDIN is not selected, then the NxConsole will + * If CONFIG_NXTERM_NXKBDIN is not selected, then the NxTerm will * receive its input from stdin (/dev/console). This works great but * cannot be shared between different windows. Chaos will ensue if you - * try to support multiple NxConsole windows without CONFIG_NXTERM_NXKBDIN + * try to support multiple NxTerm windows without CONFIG_NXTERM_NXKBDIN * * Input Parameters: * handle - A handle previously returned by nx_register, nxtk_register, or @@ -394,7 +394,7 @@ errout: * ****************************************************************************/ -void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer, uint8_t buflen) +void nxcon_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen) { FAR struct nxcon_state_s *priv; ssize_t nwritten; diff --git a/graphics/nxconsole/nxcon_putc.c b/graphics/nxterm/nxcon_putc.c similarity index 99% rename from graphics/nxconsole/nxcon_putc.c rename to graphics/nxterm/nxcon_putc.c index f612b2eb3e..aa0c8f8a3c 100644 --- a/graphics/nxconsole/nxcon_putc.c +++ b/graphics/nxterm/nxcon_putc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_putc.c + * nuttx/graphics/nxterm/nxcon_putc.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxcon_redraw.c b/graphics/nxterm/nxcon_redraw.c similarity index 97% rename from graphics/nxconsole/nxcon_redraw.c rename to graphics/nxterm/nxcon_redraw.c index b1363454c7..5ecb4ed487 100644 --- a/graphics/nxconsole/nxcon_redraw.c +++ b/graphics/nxterm/nxcon_redraw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_bkgd.c + * nuttx/graphics/nxterm/nxcon_bkgd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -98,7 +98,7 @@ * ****************************************************************************/ -void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect, bool more) +void nxcon_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more) { FAR struct nxcon_state_s *priv; int ret; diff --git a/graphics/nxconsole/nxcon_register.c b/graphics/nxterm/nxcon_register.c similarity index 97% rename from graphics/nxconsole/nxcon_register.c rename to graphics/nxterm/nxcon_register.c index 67859922fb..c2ddca8f16 100644 --- a/graphics/nxconsole/nxcon_register.c +++ b/graphics/nxterm/nxcon_register.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_register.c + * nuttx/graphics/nxterm/nxcon_register.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -73,7 +73,7 @@ ****************************************************************************/ FAR struct nxcon_state_s * - nxcon_register(NXCONSOLE handle, FAR struct nxcon_window_s *wndo, + nxcon_register(NXTERM handle, FAR struct nxcon_window_s *wndo, FAR const struct nxcon_operations_s *ops, int minor) { FAR struct nxcon_state_s *priv; @@ -152,7 +152,7 @@ FAR struct nxcon_state_s * { gdbg("Failed to register %s\n", devname); } - return (NXCONSOLE)priv; + return (NXTERM)priv; errout: kmm_free(priv); diff --git a/graphics/nxconsole/nxcon_scroll.c b/graphics/nxterm/nxcon_scroll.c similarity index 99% rename from graphics/nxconsole/nxcon_scroll.c rename to graphics/nxterm/nxcon_scroll.c index 7c645976c0..508d26ec3e 100644 --- a/graphics/nxconsole/nxcon_scroll.c +++ b/graphics/nxterm/nxcon_scroll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_scroll.c + * nuttx/graphics/nxterm/nxcon_scroll.c * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxcon_sem.c b/graphics/nxterm/nxcon_sem.c similarity index 99% rename from graphics/nxconsole/nxcon_sem.c rename to graphics/nxterm/nxcon_sem.c index 26036c2f48..97d09c2b62 100644 --- a/graphics/nxconsole/nxcon_sem.c +++ b/graphics/nxterm/nxcon_sem.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_sem.c + * nuttx/graphics/nxterm/nxcon_sem.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxcon_unregister.c b/graphics/nxterm/nxcon_unregister.c similarity index 97% rename from graphics/nxconsole/nxcon_unregister.c rename to graphics/nxterm/nxcon_unregister.c index 2ebfdf7ec2..a502eadd49 100644 --- a/graphics/nxconsole/nxcon_unregister.c +++ b/graphics/nxterm/nxcon_unregister.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_unregister.c + * nuttx/graphics/nxterm/nxcon_unregister.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include #include -#include +#include #include "nxcon_internal.h" @@ -85,7 +85,7 @@ * ****************************************************************************/ -void nxcon_unregister(NXCONSOLE handle) +void nxcon_unregister(NXTERM handle) { FAR struct nxcon_state_s *priv; char devname[NX_DEVNAME_SIZE]; diff --git a/graphics/nxconsole/nxcon_vt100.c b/graphics/nxterm/nxcon_vt100.c similarity index 99% rename from graphics/nxconsole/nxcon_vt100.c rename to graphics/nxterm/nxcon_vt100.c index 3e3374dce7..cc8796341a 100644 --- a/graphics/nxconsole/nxcon_vt100.c +++ b/graphics/nxterm/nxcon_vt100.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxcon_vt100.c + * nuttx/graphics/nxterm/nxcon_vt100.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxconsole/nxtk_register.c b/graphics/nxterm/nxtk_register.c similarity index 96% rename from graphics/nxconsole/nxtk_register.c rename to graphics/nxterm/nxtk_register.c index b3c17e8646..df392961ed 100644 --- a/graphics/nxconsole/nxtk_register.c +++ b/graphics/nxterm/nxtk_register.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxtk_register.c + * nuttx/graphics/nxterm/nxtk_register.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include +#include #include "nxcon_internal.h" @@ -186,7 +186,7 @@ static int nxtkcon_bitmap(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -NXCONSOLE nxtk_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor) +NXTERM nxtk_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor) { - return nxcon_register((NXCONSOLE)hfwnd, wndo, &g_nxtkops, minor); + return nxcon_register((NXTERM)hfwnd, wndo, &g_nxtkops, minor); } diff --git a/graphics/nxconsole/nxtool_register.c b/graphics/nxterm/nxtool_register.c similarity index 96% rename from graphics/nxconsole/nxtool_register.c rename to graphics/nxterm/nxtool_register.c index d7666e523d..631339a17a 100644 --- a/graphics/nxconsole/nxtool_register.c +++ b/graphics/nxterm/nxtool_register.c @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/graphics/nxconsole/nxtool_register.c + * nuttx/graphics/nxterm/nxtool_register.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include +#include #include "nxcon_internal.h" @@ -188,8 +188,8 @@ static int nxtool_bitmap(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -NXCONSOLE nxtool_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor) +NXTERM nxtool_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor) { - return nxcon_register((NXCONSOLE)hfwnd, wndo, &g_nxtoolops, minor); + return nxcon_register((NXTERM)hfwnd, wndo, &g_nxtoolops, minor); } diff --git a/include/nuttx/nx/nxconsole.h b/include/nuttx/nx/nxterm.h similarity index 91% rename from include/nuttx/nx/nxconsole.h rename to include/nuttx/nx/nxterm.h index 257b6a711c..ed05f6d21a 100644 --- a/include/nuttx/nx/nxconsole.h +++ b/include/nuttx/nx/nxterm.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/nx/nxconsole.h + * include/nuttx/nx/nxterm.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NX_NXCONSOLE_H -#define __INCLUDE_NUTTX_NX_NXCONSOLE_H +#ifndef __INCLUDE_NUTTX_NX_NXTERM_H +#define __INCLUDE_NUTTX_NX_NXTERM_H /**************************************************************************** * Included Files @@ -64,22 +64,22 @@ /* Nx Console configuration options: * * CONFIG_NXTERM - * Enables building of the NxConsole driver. + * Enables building of the NxTerm driver. * * Output text/graphics options: * * CONFIG_NXTERM_BPP - * Currently, NxConsole supports only a single pixel depth. This + * Currently, NxTerm supports only a single pixel depth. This * configuration setting must be provided to support that single pixel depth. * Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) * CONFIG_NXTERM_CURSORCHAR * The bitmap code to use as the cursor. Default '_' * CONFIG_NXTERM_MXCHARS - * NxConsole needs to remember every character written to the console so + * NxTerm needs to remember every character written to the console so * that it can redraw the window. This setting determines the size of some * internal memory allocations used to hold the character data. Default: 128. * CONFIG_NXTERM_CACHESIZE - * NxConsole supports caching of rendered fonts. This font caching is required + * NxTerm supports caching of rendered fonts. This font caching is required * for two reasons: (1) First, it improves text performance, but more * importantly (2) it preserves the font memory. Since the NX server runs on * a separate server thread, it requires that the rendered font memory persist @@ -189,7 +189,7 @@ /* This is the handle that can be used to access the consoles */ -typedef FAR void *NXCONSOLE; +typedef FAR void *NXTERM; /* This structure describes the window and font characteristics */ @@ -237,7 +237,7 @@ extern "C" { * ****************************************************************************/ -EXTERN NXCONSOLE nx_register(NXWINDOW hwnd, FAR struct nxcon_window_s *wndo, +EXTERN NXTERM nx_register(NXWINDOW hwnd, FAR struct nxcon_window_s *wndo, int minor); /**************************************************************************** @@ -260,7 +260,7 @@ EXTERN NXCONSOLE nx_register(NXWINDOW hwnd, FAR struct nxcon_window_s *wndo, * ****************************************************************************/ -EXTERN NXCONSOLE nxtk_register(NXTKWINDOW hfwnd, +EXTERN NXTERM nxtk_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor); /**************************************************************************** @@ -285,7 +285,7 @@ EXTERN NXCONSOLE nxtk_register(NXTKWINDOW hfwnd, * ****************************************************************************/ -EXTERN NXCONSOLE nxtool_register(NXTKWINDOW hfwnd, +EXTERN NXTERM nxtool_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor); /**************************************************************************** @@ -303,7 +303,7 @@ EXTERN NXCONSOLE nxtool_register(NXTKWINDOW hfwnd, * ****************************************************************************/ -EXTERN void nxcon_unregister(NXCONSOLE handle); +EXTERN void nxcon_unregister(NXTERM handle); /**************************************************************************** * Name: nxcon_redraw @@ -324,7 +324,7 @@ EXTERN void nxcon_unregister(NXCONSOLE handle); * ****************************************************************************/ -EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect, +EXTERN void nxcon_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more); /**************************************************************************** @@ -332,15 +332,15 @@ EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect, * * Description: * This function should be driven by the window kbdin callback function - * (see nx.h). When the NxConsole is the top window and keyboard input is + * (see nx.h). When the NxTerm is the top window and keyboard input is * received on the top window, that window callback should be directed to * this function. This function will buffer the keyboard data and make - * it available to the NxConsole as stdin. + * it available to the NxTerm as stdin. * - * If CONFIG_NXTERM_NXKBDIN is not selected, then the NxConsole will + * If CONFIG_NXTERM_NXKBDIN is not selected, then the NxTerm will * receive its input from stdin (/dev/console). This works great but * cannot be shared between different windows. Chaos will ensue if you - * try to support multiple NxConsole windows without CONFIG_NXTERM_NXKBDIN + * try to support multiple NxTerm windows without CONFIG_NXTERM_NXKBDIN * * Input Parameters: * handle - A handle previously returned by nx_register, nxtk_register, or @@ -354,7 +354,7 @@ EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect, ****************************************************************************/ #ifdef CONFIG_NXTERM_NXKBDIN -EXTERN void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer, +EXTERN void nxcon_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen); #endif @@ -364,4 +364,4 @@ EXTERN void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer, #endif #endif /* CONFIG_NXTERM */ -#endif /* __INCLUDE_NUTTX_NX_NXCONSOLE_H */ +#endif /* __INCLUDE_NUTTX_NX_NXTERM_H */