This removes the last traces of single-user mode.
This commit is contained in:
parent
1a170dc73d
commit
90d4cf6ede
@ -28,31 +28,6 @@ config NXWIDGETS_FLICKERFREE
|
|||||||
lower-performance flicker-reductions measures where-ever thay may
|
lower-performance flicker-reductions measures where-ever thay may
|
||||||
be available.
|
be available.
|
||||||
|
|
||||||
config NXWIDGETS_EXTERNINIT
|
|
||||||
bool "External display Initialization"
|
|
||||||
default n
|
|
||||||
depends on LIB_BOARDCTL
|
|
||||||
select BOARDCTL_GRAPHICS
|
|
||||||
---help---
|
|
||||||
Define to support external display initialization.
|
|
||||||
|
|
||||||
config NXWIDGETS_DEVNO
|
|
||||||
int "LCD Device Number"
|
|
||||||
default 0
|
|
||||||
depends on (NXWIDGETS_EXTERNINIT || NX_LCDDRIVER) && !NX_MULTIUSER
|
|
||||||
---help---
|
|
||||||
LCD device number (in case there are more than one LCDs connected).
|
|
||||||
Default: 0
|
|
||||||
|
|
||||||
config NXWIDGETS_VPLANE
|
|
||||||
int "Plane Number"
|
|
||||||
default 0
|
|
||||||
depends on !NX_LCDDRIVER && !NXWIDGETS_EXTERNINIT && !NX_MULTIUSER
|
|
||||||
---help---
|
|
||||||
Only a single video plane is supported. Default: 0
|
|
||||||
|
|
||||||
if NX_MULTIUSER
|
|
||||||
|
|
||||||
config NXWIDGET_SERVERINIT
|
config NXWIDGET_SERVERINIT
|
||||||
bool "Start server"
|
bool "Start server"
|
||||||
default y
|
default y
|
||||||
@ -70,15 +45,13 @@ config NXWIDGETS_CLIENTPRIO
|
|||||||
default 100
|
default 100
|
||||||
---help---
|
---help---
|
||||||
The thread that calls CNxServer::connect() will be re-prioritized to
|
The thread that calls CNxServer::connect() will be re-prioritized to
|
||||||
this priority. This applies only if NX is configured in multi-user
|
this priority. Default: 100
|
||||||
mode (NX_MULTIUSER=y). Default: 100
|
|
||||||
|
|
||||||
config NXWIDGETS_LISTENERPRIO
|
config NXWIDGETS_LISTENERPRIO
|
||||||
int "NX Listener Priority"
|
int "NX Listener Priority"
|
||||||
default 100
|
default 100
|
||||||
---help---
|
---help---
|
||||||
Priority of the NX event listener thread. This applies only if NX
|
Priority of the NX event listener thread. Default: 100
|
||||||
is configured in multi-user mode (NX_MULTIUSER=y). Default: 100
|
|
||||||
|
|
||||||
config NXWIDGETS_LISTENERSTACK
|
config NXWIDGETS_LISTENERSTACK
|
||||||
int "NX Listener Stack Size"
|
int "NX Listener Stack Size"
|
||||||
@ -86,8 +59,6 @@ config NXWIDGETS_LISTENERSTACK
|
|||||||
---help---
|
---help---
|
||||||
NX listener thread stack size (in multi-user mode). Default 2048
|
NX listener thread stack size (in multi-user mode). Default 2048
|
||||||
|
|
||||||
endif # NX_MULTIUSER
|
|
||||||
|
|
||||||
config NXWIDGET_EVENTWAIT
|
config NXWIDGET_EVENTWAIT
|
||||||
bool "Event Waiting"
|
bool "Event Waiting"
|
||||||
default n
|
default n
|
||||||
@ -294,7 +265,7 @@ endif # NxWidgets
|
|||||||
config NXWM
|
config NXWM
|
||||||
bool "Enable NxWM"
|
bool "Enable NxWM"
|
||||||
default n
|
default n
|
||||||
depends on NXWIDGETS && NX_MULTIUSER
|
depends on NXWIDGETS
|
||||||
---help---
|
---help---
|
||||||
Enable support for the NuttX Tiny Window Manager (NxWM)
|
Enable support for the NuttX Tiny Window Manager (NxWM)
|
||||||
|
|
||||||
@ -628,10 +599,10 @@ endif # NXWM_CUSTOM_STARTWINDOW_ICON
|
|||||||
|
|
||||||
config NXWM_STARTWINDOW_MQNAME
|
config NXWM_STARTWINDOW_MQNAME
|
||||||
string "Message Queue Name"
|
string "Message Queue Name"
|
||||||
default "/dev/nxwm"
|
default "nxwm"
|
||||||
---help---
|
---help---
|
||||||
The well known name of the message queue. Used to communicated from
|
The well known name of the message queue. Used to communicated from
|
||||||
CWindowMessenger to the start window thread. Default: "/dev/nxwm"
|
CWindowMessenger to the start window thread. Default: "nxwm"
|
||||||
|
|
||||||
config NXWM_STARTWINDOW_MXMSGS
|
config NXWM_STARTWINDOW_MXMSGS
|
||||||
int "Max Messages"
|
int "Max Messages"
|
||||||
|
@ -1068,10 +1068,6 @@ examples/nx
|
|||||||
include 2, 4, 8, 16, 24, and 32. Default is 32.
|
include 2, 4, 8, 16, 24, and 32. Default is 32.
|
||||||
CONFIG_EXAMPLES_NX_RAWWINDOWS -- Use raw windows; Default is to
|
CONFIG_EXAMPLES_NX_RAWWINDOWS -- Use raw windows; Default is to
|
||||||
use pretty, framed NXTK windows with toolbars.
|
use pretty, framed NXTK windows with toolbars.
|
||||||
|
|
||||||
This test requires the multiple user vrsion of NX selected with
|
|
||||||
CONFIG_NX_MULTIUSER. Then the following configuration options also apply:
|
|
||||||
|
|
||||||
CONFIG_EXAMPLES_NX_STACKSIZE -- The stacksize to use when creating
|
CONFIG_EXAMPLES_NX_STACKSIZE -- The stacksize to use when creating
|
||||||
the NX server. Default 2048
|
the NX server. Default 2048
|
||||||
CONFIG_EXAMPLES_NX_CLIENTPRIO -- The client priority. Default: 100
|
CONFIG_EXAMPLES_NX_CLIENTPRIO -- The client priority. Default: 100
|
||||||
@ -1101,7 +1097,6 @@ examples/nxterm
|
|||||||
|
|
||||||
CONFIG_NX=y -- NX graphics must be enabled
|
CONFIG_NX=y -- NX graphics must be enabled
|
||||||
CONFIG_NXTERM=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_MQUEUE=n -- Message queue support must be available.
|
||||||
CONFIG_DISABLE_SIGNALS=n -- Signals are needed
|
CONFIG_DISABLE_SIGNALS=n -- Signals are needed
|
||||||
CONFIG_DISABLE_PTHREAD=n -- pthreads are needed
|
CONFIG_DISABLE_PTHREAD=n -- pthreads are needed
|
||||||
@ -1134,10 +1129,6 @@ examples/nxterm
|
|||||||
Default: SCHED_PRIORITY_DEFAULT
|
Default: SCHED_PRIORITY_DEFAULT
|
||||||
CONFIG_EXAMPLES_NXTERM_STACKSIZE - Stack size allocated for the
|
CONFIG_EXAMPLES_NXTERM_STACKSIZE - Stack size allocated for the
|
||||||
NxTerm task. Default: 2048
|
NxTerm task. Default: 2048
|
||||||
|
|
||||||
The following configuration settings determine how to set up the NX
|
|
||||||
server (CONFIG_NX_MULTIUSER):
|
|
||||||
|
|
||||||
CONFIG_EXAMPLES_NXTERM_STACKSIZE -- The stacksize to use when creating
|
CONFIG_EXAMPLES_NXTERM_STACKSIZE -- The stacksize to use when creating
|
||||||
the NX server. Default 2048
|
the NX server. Default 2048
|
||||||
CONFIG_EXAMPLES_NXTERM_CLIENTPRIO -- The client priority. Default: 100
|
CONFIG_EXAMPLES_NXTERM_CLIENTPRIO -- The client priority. Default: 100
|
||||||
@ -1300,11 +1291,6 @@ examples/nxtext
|
|||||||
can be put in the background window. Default is 128.
|
can be put in the background window. Default is 128.
|
||||||
CONFIG_EXAMPLES_NXTEXT_GLCACHE - The maximum nuber of pre-rendered
|
CONFIG_EXAMPLES_NXTEXT_GLCACHE - The maximum nuber of pre-rendered
|
||||||
fonts that can be retained for the background window.
|
fonts that can be retained for the background window.
|
||||||
|
|
||||||
This test must be performed with the multiple user version of NX selected
|
|
||||||
with CONFIG_NX_MULTIUSER=y. The following configuration options also
|
|
||||||
apply:
|
|
||||||
|
|
||||||
CONFIG_EXAMPLES_NXTEXT_STACKSIZE -- The stacksize to use when creating
|
CONFIG_EXAMPLES_NXTEXT_STACKSIZE -- The stacksize to use when creating
|
||||||
the NX server. Default 2048
|
the NX server. Default 2048
|
||||||
CONFIG_EXAMPLES_NXTEXT_CLIENTPRIO -- The client priority. Default: 100
|
CONFIG_EXAMPLES_NXTEXT_CLIENTPRIO -- The client priority. Default: 100
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NX
|
config EXAMPLES_NX
|
||||||
bool "NX graphics example"
|
bool "NX graphics example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
select LIB_BOARDCTL
|
select LIB_BOARDCTL
|
||||||
---help---
|
---help---
|
||||||
Enable the NX graphics example
|
Enable the NX graphics example
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NXHELLO
|
config EXAMPLES_NXHELLO
|
||||||
bool "NX graphics \"Hello, World!\" example"
|
bool "NX graphics \"Hello, World!\" example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
select LIB_BOARDCTL
|
select LIB_BOARDCTL
|
||||||
---help---
|
---help---
|
||||||
Enable the NX graphics \"Hello, World!\" example
|
Enable the NX graphics \"Hello, World!\" example
|
||||||
|
@ -60,10 +60,6 @@
|
|||||||
# error "NX is not enabled (CONFIG_NX)"
|
# error "NX is not enabled (CONFIG_NX)"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_NX_MULTIUSER
|
|
||||||
# error "Multi-user NX support is required (CONFIG_NX_MULTIUSER=y)"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* If not specified, assume that the hardware supports one video plane */
|
/* If not specified, assume that the hardware supports one video plane */
|
||||||
|
|
||||||
#if CONFIG_NX_NPLANES != 1
|
#if CONFIG_NX_NPLANES != 1
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NXIMAGE
|
config EXAMPLES_NXIMAGE
|
||||||
bool "NX graphics image example"
|
bool "NX graphics image example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
select LIB_BOARDCTL
|
select LIB_BOARDCTL
|
||||||
---help---
|
---help---
|
||||||
Enable the X graphics image example
|
Enable the X graphics image example
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NXLINES
|
config EXAMPLES_NXLINES
|
||||||
bool "NX graphics lines example"
|
bool "NX graphics lines example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
select LIB_BOARDCTL
|
select LIB_BOARDCTL
|
||||||
---help---
|
---help---
|
||||||
Enable the X graphics lines example
|
Enable the X graphics lines example
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NXTERM
|
config EXAMPLES_NXTERM
|
||||||
bool "NxTerm example"
|
bool "NxTerm example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
select LIB_BOARDCTL
|
select LIB_BOARDCTL
|
||||||
---help---
|
---help---
|
||||||
Enable the NxTerm example
|
Enable the NxTerm example
|
||||||
|
@ -69,12 +69,6 @@
|
|||||||
# error "NxTerm is not enabled (CONFIG_NXTERM=y)"
|
# error "NxTerm is not enabled (CONFIG_NXTERM=y)"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* NxTerm requires NX Multi-user mode */
|
|
||||||
|
|
||||||
#ifndef CONFIG_NX_MULTIUSER
|
|
||||||
# error "Multi-user NX support is required (CONFIG_NX_MULTIUSER=y)"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* If there is no NSH console, then why are we running this example? */
|
/* If there is no NSH console, then why are we running this example? */
|
||||||
|
|
||||||
#ifndef CONFIG_NSH_CONSOLE
|
#ifndef CONFIG_NSH_CONSOLE
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
config EXAMPLES_NXTEXT
|
config EXAMPLES_NXTEXT
|
||||||
bool "NX graphics text example"
|
bool "NX graphics text example"
|
||||||
default n
|
default n
|
||||||
depends on NX_MULTIUSER
|
depends on NX
|
||||||
---help---
|
---help---
|
||||||
Enable the NX graphics text example
|
Enable the NX graphics text example
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ config GRAPHICS_TRAVELER
|
|||||||
bool "Traveler game"
|
bool "Traveler game"
|
||||||
default n
|
default n
|
||||||
select FSUTILS_INIFILE
|
select FSUTILS_INIFILE
|
||||||
depends on !NX || NX_MULTIUSER
|
|
||||||
---help---
|
---help---
|
||||||
Enable or disable the graphic Traveler game
|
Enable or disable the graphic Traveler game
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user