From 9d21ecbd2d7832814569fd738c4ea538a274f70d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 14 Oct 2017 16:52:59 -0600 Subject: [PATCH] All configurations that use NXLINES must select NX_MULTIUSER --- configs/mikroe-stm32f4/nxlines/defconfig | 3 +++ configs/nucleo-f303re/nxlines/defconfig | 5 +++-- configs/open1788/nxlines/defconfig | 3 +++ configs/samv71-xult/mxtxplnd/defconfig | 3 +++ configs/sim/nxlines/defconfig | 5 ++++- configs/stm32f4discovery/nxlines/defconfig | 3 +++ configs/zp214xpa/nxlines/defconfig | 5 +++-- libnx/nxmu/nxmu_sendserver.c | 2 +- 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig index 16460c044e..0787a86fb7 100644 --- a/configs/mikroe-stm32f4/nxlines/defconfig +++ b/configs/mikroe-stm32f4/nxlines/defconfig @@ -34,6 +34,7 @@ CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -42,6 +43,8 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXTK_BORDERCOLOR1=0x8410 diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig index 0e7151ab16..2148384e7c 100644 --- a/configs/nucleo-f303re/nxlines/defconfig +++ b/configs/nucleo-f303re/nxlines/defconfig @@ -12,18 +12,19 @@ CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_CAN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y CONFIG_EXAMPLES_NXLINES=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_LCD_SSD1351=y CONFIG_LCD=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig index 7adff75ce6..aa0f37367c 100644 --- a/configs/open1788/nxlines/defconfig +++ b/configs/open1788/nxlines/defconfig @@ -29,8 +29,11 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig index 4e511e762c..f539f422fd 100644 --- a/configs/samv71-xult/mxtxplnd/defconfig +++ b/configs/samv71-xult/mxtxplnd/defconfig @@ -44,6 +44,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_AT24XX=y CONFIG_MTD_AT25=y CONFIG_MTD_CONFIG=y @@ -55,6 +56,8 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig index d439f90122..67a0e13898 100644 --- a/configs/sim/nxlines/defconfig +++ b/configs/sim/nxlines/defconfig @@ -25,14 +25,16 @@ CONFIG_HAVE_CXX=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=8192 CONFIG_MAX_TASKS=16 -CONFIG_MQ_MAXMSGSIZE=48 +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_FATDEVNO=2 CONFIG_NSH_LIBRARY=y CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSDEVNO=1 CONFIG_NSH_ROMFSETC=y +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y @@ -40,6 +42,7 @@ CONFIG_NXFONT_SANS28X37B=y CONFIG_NXTK_BORDERCOLOR1=0x005a96bd CONFIG_NXTK_BORDERCOLOR2=0x00233a49 CONFIG_NXTK_BORDERCOLOR3=0x00f8f8f8 +CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PTHREAD_STACK_DEFAULT=8192 CONFIG_SCHED_ONEXIT=y CONFIG_SCHED_WAITPID=y diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index 601e8f901c..cd7d9c8b60 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -32,13 +32,16 @@ CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig index 0d038f49f5..4b6f28e26c 100644 --- a/configs/zp214xpa/nxlines/defconfig +++ b/configs/zp214xpa/nxlines/defconfig @@ -14,7 +14,6 @@ CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0x01 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 CONFIG_EXAMPLES_NXLINES_BPP=1 -CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y CONFIG_EXAMPLES_NXLINES_LINECOLOR=0x01 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4 CONFIG_EXAMPLES_NXLINES=y @@ -22,11 +21,13 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_LCD_MAXCONTRAST=255 CONFIG_LCD_UG2864AMBAG01=y CONFIG_LCD=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_WRITEONLY=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y diff --git a/libnx/nxmu/nxmu_sendserver.c b/libnx/nxmu/nxmu_sendserver.c index 65266a659c..2072ad2894 100644 --- a/libnx/nxmu/nxmu_sendserver.c +++ b/libnx/nxmu/nxmu_sendserver.c @@ -86,7 +86,7 @@ int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg, ret = _MQ_SEND(conn->cwrmq, msg, msglen, NX_SVRMSG_PRIO); if (ret < 0) { - gerr("ERROR: _MQ_SEND failed: %d\n", _MQ_ERRNO(rer)); + gerr("ERROR: _MQ_SEND failed: %d\n", _MQ_GETERRNO(ret)); } return ret;