From f3ce29aa9b591ff1b6a697484528f7340580ace7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 29 Dec 2013 11:11:48 -0600
Subject: Add nx_start() to simplify starting the NX server from within the
 RTOS

---
 NxWidgets/Kconfig                            | 4 ++--
 NxWidgets/libnxwidgets/include/cnxserver.hxx | 2 +-
 NxWidgets/libnxwidgets/src/cnxserver.cxx     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'NxWidgets')

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);
-- 
cgit v1.2.3