4 files changed, 20 insertions, 9 deletions
diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index 75afe862a..3daa60f66 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -162,6 +162,7 @@ CONFIG_SIM_TOUCHSCREEN=n
 #  the worker thread.  Default: 4
 # CONFIG_SCHED_WAITPID - Enable the waitpid() API
 # CONFIG_SCHED_ATEXIT - Enabled the atexit() API
+# CONFIG_SCHED_ONEXIT - Enabled the on_exit() API
 #
 #CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
@@ -195,6 +196,7 @@ CONFIG_SCHED_WORKPERIOD=(50*1000)
 CONFIG_SCHED_WORKSTACKSIZE=8192
 CONFIG_SCHED_WAITPID=y
 CONFIG_SCHED_ATEXIT=n
+CONFIG_SCHED_ONEXIT=y
 
 #
 # The following can be used to disable categories of
@@ -557,11 +559,14 @@ CONFIG_NX_MXCLIENTMSGS=16
 # NxWidgets / NxWM
 #
 # Use all defaults except
-# 1. Need an especially big server stack size to work with X
-# 2. Make the NxWidgets background color match the NxWM back color
-# 3. Taskbar on the left
-# 4. Bigger stack for NxConsole
-#
+# 1. 32 bits-per-pixel
+# 2. Need an especially big server stack size to work with X
+# 3. Make the NxWidgets background color match the NxWM back color
+# 4. Taskbar on the left
+# 5. Bigger stack for NxConsole
+# 6. No touchscreen
+#
+CONFIG_NXWIDGETS_BPP=32
 CONFIG_NXWIDGETS_SERVERSTACK=16384
 CONFIG_NXWIDGETS_LISTENERSTACK=8192
 CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
@@ -571,6 +576,7 @@ CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=MKRGB(35,58,73)
 CONFIG_NXWM_TASKBAR_LEFT=y
 CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192
 CONFIG_NXWM_UNITTEST=y
+CONFIG_NXWM_TOUCHSCREEN=n
 
 #
 # NxConsole Configuration Settings:
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 0633a03f4..2a3cf3c86 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -512,7 +512,7 @@ CONFIG_HAVE_LIBM=n
 #  the worker thread.  Default: 4
 # CONFIG_SCHED_WAITPID - Enable the waitpid() API
 # CONFIG_SCHED_ATEXIT - Enabled the atexit() API
-# CONFIG_SCHED_ONEXIT - Enabled the atexit() API
+# CONFIG_SCHED_ONEXIT - Enabled the on_exit() API
 #
 #CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
@@ -710,7 +710,7 @@ CONFIG_NAME_MAX=32
 CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
-CONFIG_PREALLOC_MQ_MSGS=8
+CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=48
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_PREALLOC_WDOGS=8
diff --git a/nuttx/fs/nfs/rpc.h b/nuttx/fs/nfs/rpc.h
index 16bafa440..52694ccbd 100644
--- a/nuttx/fs/nfs/rpc.h
+++ b/nuttx/fs/nfs/rpc.h
@@ -171,7 +171,7 @@ struct auth_unix
 struct rpc_call_header
 {
   uint32_t rp_xid;            /* request transaction id */
-  int32_t rp_direction;       /* call direction (0) */
+  int32_t  rp_direction;      /* call direction (0) */
   uint32_t rp_rpcvers;        /* rpc version (2) */
   uint32_t rp_prog;           /* program */
   uint32_t rp_vers;           /* version */
diff --git a/nuttx/graphics/nxmu/nx_disconnect.c b/nuttx/graphics/nxmu/nx_disconnect.c
index bbbf05251..48e1e9cc0 100644
--- a/nuttx/graphics/nxmu/nx_disconnect.c
+++ b/nuttx/graphics/nxmu/nx_disconnect.c
@@ -90,6 +90,7 @@ void nx_disconnect(NXHANDLE handle)
 {
   FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
   struct nxsvrmsg_s       outmsg;
+  int                     ret;
 
   /* Inform the server that this client no longer exists */
 
@@ -98,6 +99,10 @@ void nx_disconnect(NXHANDLE handle)
 
   /* We will finish the teardown upon receipt of the DISCONNECTED message */
 
-  return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s));
+  ret = nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s));
+  if (ret < 0)
+    {
+      gdbg("ERROR: nxmu_sendserver() returned %d\n", ret);
+    }
 }