diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:25:51 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:25:51 -0600 |
commit | 9f0d9a6db5d6d1eec7bec3a029bb37a95245e495 (patch) | |
tree | eca80fba732d2ee0e6eb3af44d6473de4de877c5 /apps/examples | |
parent | 4860036d8f145187cfe700743def8d0ee3548f1b (diff) | |
download | px4-nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.tar.gz px4-nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.tar.bz2 px4-nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.zip |
Rename CONFIG_EXAMPLES_NXCONSOLE to CONFIG_EXAMPLES_NXTERM; rename CONFIG_NXWM_NXCONSOLE to CONFIG_NXWM_NXTERM
Diffstat (limited to 'apps/examples')
-rw-r--r-- | apps/examples/Make.defs | 2 | ||||
-rw-r--r-- | apps/examples/README.txt | 4 | ||||
-rw-r--r-- | apps/examples/nxconsole/Kconfig | 4 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_internal.h | 14 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_main.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs index 147ac3f14..c20545929 100644 --- a/apps/examples/Make.defs +++ b/apps/examples/Make.defs @@ -154,7 +154,7 @@ ifeq ($(CONFIG_EXAMPLES_NX),y) CONFIGURED_APPS += examples/nx endif -ifeq ($(CONFIG_EXAMPLES_NXCONSOLE),y) +ifeq ($(CONFIG_EXAMPLES_NXTERM),y) CONFIGURED_APPS += examples/nxconsole endif diff --git a/apps/examples/README.txt b/apps/examples/README.txt index 2db5a1611..b91cf7615 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -864,9 +864,9 @@ examples/nxconsole CONFIG_EXAMPLES_NXCON_DEVNAME -- The quoated, full path to the NX console device corresponding to CONFIG_EXAMPLES_NXCON_MINOR. Default: "/dev/nxcon0" - CONFIG_EXAMPLES_NXCONSOLE_PRIO - Priority of the NxConsole task. + CONFIG_EXAMPLES_NXTERM_PRIO - Priority of the NxConsole task. Default: SCHED_PRIORITY_DEFAULT - CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE - Stack size allocated for the + CONFIG_EXAMPLES_NXTERM_STACKSIZE - Stack size allocated for the NxConsole task. Default: 2048 The following configuration settings determine how to set up the NX diff --git a/apps/examples/nxconsole/Kconfig b/apps/examples/nxconsole/Kconfig index a52c49453..1ca517842 100644 --- a/apps/examples/nxconsole/Kconfig +++ b/apps/examples/nxconsole/Kconfig @@ -3,11 +3,11 @@ # see misc/tools/kconfig-language.txt. # -config EXAMPLES_NXCONSOLE +config EXAMPLES_NXTERM bool "NxConsole example" default n ---help--- Enable the NxConsole example -if EXAMPLES_NXCONSOLE +if EXAMPLES_NXTERM endif diff --git a/apps/examples/nxconsole/nxcon_internal.h b/apps/examples/nxconsole/nxcon_internal.h index 6dd51e47d..548a9f883 100644 --- a/apps/examples/nxconsole/nxcon_internal.h +++ b/apps/examples/nxconsole/nxcon_internal.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H -#define __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H +#ifndef __EXAMPLES_NXTERM_NXCON_INTERNAL_H +#define __EXAMPLES_NXTERM_NXCON_INTERNAL_H /**************************************************************************** * Included Files @@ -227,12 +227,12 @@ /* NxConsole task */ -#ifndef CONFIG_EXAMPLES_NXCONSOLE_PRIO -# define CONFIG_EXAMPLES_NXCONSOLE_PRIO SCHED_PRIORITY_DEFAULT +#ifndef CONFIG_EXAMPLES_NXTERM_PRIO +# define CONFIG_EXAMPLES_NXTERM_PRIO SCHED_PRIORITY_DEFAULT #endif -#ifndef CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE -# define CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE 2048 +#ifndef CONFIG_EXAMPLES_NXTERM_STACKSIZE +# define CONFIG_EXAMPLES_NXTERM_STACKSIZE 2048 #endif /* Debug ********************************************************************/ @@ -307,4 +307,4 @@ extern FAR NX_DRIVERTYPE *up_nxdrvinit(unsigned int devno); extern int nxcon_server(int argc, char *argv[]); extern FAR void *nxcon_listener(FAR void *arg); -#endif /* __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H */ +#endif /* __EXAMPLES_NXTERM_NXCON_INTERNAL_H */ diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 6a5c0c20b..ca27acd62 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -393,8 +393,8 @@ int nxcon_main(int argc, char **argv) * from this task. */ - g_nxcon_vars.pid = task_create("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO, - CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE, + g_nxcon_vars.pid = task_create("NxConsole", CONFIG_EXAMPLES_NXTERM_PRIO, + CONFIG_EXAMPLES_NXTERM_STACKSIZE, nxcon_task, NULL); ASSERT(g_nxcon_vars.pid > 0); return EXIT_SUCCESS; |