From e02f2f93733b2ef62f05f832855f8eedb59e885b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 20 Sep 2014 14:18:08 -0600 Subject: [PATCH] Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM* --- examples/README.txt | 2 +- examples/nxconsole/nxcon_internal.h | 6 +++--- examples/nxtext/nxtext_internal.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/README.txt b/examples/README.txt index 29219daaf..2db5a1611 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -818,7 +818,7 @@ examples/nxconsole an NX winbdow. Prerequisite configuration settings for this test include: CONFIG_NX=y -- NX graphics must be enabled - CONFIG_NXCONSOLE=y -- The NX console driver must be built + CONFIG_NXTERM=y -- The NX console driver must be built CONFIG_NX_MULTIUSER=y -- NX multi-user support must be enabled. CONFIG_DISABLE_MQUEUE=n -- Message queue support must be available. CONFIG_DISABLE_SIGNALS=n -- Signals are needed diff --git a/examples/nxconsole/nxcon_internal.h b/examples/nxconsole/nxcon_internal.h index 02d84d025..6dd51e47d 100644 --- a/examples/nxconsole/nxcon_internal.h +++ b/examples/nxconsole/nxcon_internal.h @@ -65,8 +65,8 @@ /* Can't do the NxConsole example if the NxConsole driver is not built */ -#ifndef CONFIG_NXCONSOLE -# error "NxConsole is not enabled (CONFIG_NXCONSOLE=y)" +#ifndef CONFIG_NXTERM +# error "NxConsole is not enabled (CONFIG_NXTERM=y)" #endif /* NxConsole requires NX Multi-user mode */ @@ -111,7 +111,7 @@ # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_EXAMPLES_NXCON_BPP 16 //#elif !defined(CONFIG_NX_DISABLE_24BPP) -//# define CONFIG_NXCONSOLE_BPP 24 +//# define CONFIG_NXTERM_BPP 24 # elif !defined(CONFIG_NX_DISABLE_32BPP) # define CONFIG_EXAMPLES_NXCON_BPP 32 # else diff --git a/examples/nxtext/nxtext_internal.h b/examples/nxtext/nxtext_internal.h index 1e64193a3..445809607 100644 --- a/examples/nxtext/nxtext_internal.h +++ b/examples/nxtext/nxtext_internal.h @@ -78,7 +78,7 @@ # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_EXAMPLES_NXTEXT_BPP 16 //#elif !defined(CONFIG_NX_DISABLE_24BPP) -//# define CONFIG_NXCONSOLE_BPP 24 +//# define CONFIG_NXTERM_BPP 24 # elif !defined(CONFIG_NX_DISABLE_32BPP) # define CONFIG_EXAMPLES_NXTEXT_BPP 32 # else