diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-29 11:11:48 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-29 11:11:48 -0600 |
| commit | f3ce29aa9b591ff1b6a697484528f7340580ace7 (patch) | |
| tree | 69b85fc081c232b5ed806b06e8d0f750b42cbdea /NxWidgets | |
| parent | 513671256fe287033b8874d352fdf34bf6a14bea (diff) | |
| download | nuttx-f3ce29aa9b591ff1b6a697484528f7340580ace7.tar.gz nuttx-f3ce29aa9b591ff1b6a697484528f7340580ace7.tar.bz2 nuttx-f3ce29aa9b591ff1b6a697484528f7340580ace7.zip | |
Add nx_start() to simplify starting the NX server from within the RTOS
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/Kconfig | 4 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cnxserver.hxx | 2 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cnxserver.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index b6ac4fb7d..2d1467425 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -28,8 +28,7 @@ config NXWIDGETS_FLICKERFREE config NXWIDGETS_EXTERNINIT bool "External display Initialization" - default 0 - depends on NXWIDGET_SERVERINIT + default n ---help--- Define to support external display initialization. @@ -44,6 +43,7 @@ config NXWIDGETS_DEVNO config NXWIDGETS_VPLANE int "Plane Number" default 0 + depends on !NX_LCDDRIVER && !NXWIDGETS_EXTERNINIT ---help--- Only a single video plane is supported. Default: 0 diff --git a/NxWidgets/libnxwidgets/include/cnxserver.hxx b/NxWidgets/libnxwidgets/include/cnxserver.hxx index c6ca21bfc..f70dbdbdb 100644 --- a/NxWidgets/libnxwidgets/include/cnxserver.hxx +++ b/NxWidgets/libnxwidgets/include/cnxserver.hxx @@ -95,7 +95,7 @@ namespace NXWidgets * serializes the multi-threaded accesses to the display. */ -#ifdef CONFIG_NX_MULTIUSER +#if defined(CONFIG_NX_MULTIUSER) && defined(CONFIG_NXWIDGET_SERVERINIT) static int server(int argc, char *argv[]); #endif diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index 84f6701da..6adbc20a5 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -201,7 +201,6 @@ bool CNxServer::connect(void) { struct sched_param param; pthread_t thread; - pid_t serverId; int ret; // Set the client task priority @@ -218,8 +217,9 @@ bool CNxServer::connect(void) // Start the server task gvdbg("CNxServer::connect: Starting server task\n"); - serverId = TASK_CREATE("NX Server", CONFIG_NXWIDGETS_SERVERPRIO, - CONFIG_NXWIDGETS_SERVERSTACK, server, (FAR char * const *)0); + pid_t serverId = TASK_CREATE("NX Server", CONFIG_NXWIDGETS_SERVERPRIO, + CONFIG_NXWIDGETS_SERVERSTACK, server, + (FAR char * const *)0); if (serverId < 0) { gdbg("NxServer::connect: Failed to create nx_servertask task: %d\n", errno); |