From 31bd02c3639c38438feccc61cf77dd84785b659f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 1 Dec 2016 17:03:47 -0600
Subject: [PATCH] Update NxWidges/Kconfig

---
 NxWidgets/Kconfig | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 9474cacc9..8fbb24fe8 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -39,7 +39,7 @@ config NXWIDGETS_EXTERNINIT
 config NXWIDGETS_DEVNO
 	int "LCD Device Number"
 	default 0
-	depends on NXWIDGETS_EXTERNINIT || NX_LCDDRIVER
+	depends on (NXWIDGETS_EXTERNINIT || NX_LCDDRIVER) && !NX_MULTIUSER
 	---help---
 		LCD device number (in case there are more than one LCDs connected).
 		Default: 0
@@ -47,7 +47,7 @@ config NXWIDGETS_DEVNO
 config NXWIDGETS_VPLANE
 	int "Plane Number"
 	default 0
-	depends on !NX_LCDDRIVER && !NXWIDGETS_EXTERNINIT
+	depends on !NX_LCDDRIVER && !NXWIDGETS_EXTERNINIT && !NX_MULTIUSER
 	---help---
 		Only a single video plane is supported. Default: 0
 
@@ -65,28 +65,6 @@ config NXWIDGET_SERVERINIT
 		by other, external logic and will simply attempt to connect to the
 		server.
 
-if NXWIDGET_SERVERINIT
-
-config NXWIDGETS_SERVERPRIO
-	int "NX Server priority"
-	default 110
-	---help---
-		Priority of the NX server.  This applies only if NX is configured in
-		multi-user mode (NX_MULTIUSER=y).  Default: 110.
-
-		NOTE:  Of the three priority definitions here, NXWIDGETS_SERVERPRIO
-		should have the highest priority to avoid data overrun race conditions.
-		Such errors would most likely appear as duplicated rows of data on the
-		display.
-
-config NXWIDGETS_SERVERSTACK
-	int "NX Server Stack Size"
-	default 2048
-	---help---
-		NX server thread stack size (in multi-user mode).  Default 2048
-
-endif # NXWIDGET_SERVERINIT
-
 config NXWIDGETS_CLIENTPRIO
 	int "NX Client Priority"
 	default 100
@@ -673,7 +651,7 @@ config NXWM_STARTWINDOW_PRIO
 	---help---
 		Priority of the StartWindow task.  Default: 100.
 
-		NOTE:  This priority should be less than NXWIDGETS_SERVERPRIO or else
+		NOTE:  This priority should be less than NXSTART_SERVERPRIO or else
 		there may be data overrun errors. Such errors would most likely appear
 		as duplicated rows of data on the display.
 
@@ -703,7 +681,7 @@ config NXWM_NXTERM_PRIO
 	---help---
 		Priority of the NxTerm task.  Default:  100.
 
-		NOTE:  This priority should be less than NXWIDGETS_SERVERPRIO or
+		NOTE:  This priority should be less than NXSTART_SERVERPRIO or
 		else there may be data overrun errors. Such errors would most likely
 		appear as duplicated rows of data on the display.