OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

All configurations that use NXLINES must select NX_MULTIUSER

This commit is contained in:
Gregory Nutt 2017-10-14 16:52:59 -06:00
parent 18167a2953
commit 9d21ecbd2d
8 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/mikroe-stm32f4/nxlines/defconfig
View File

@ -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

5
configs/nucleo-f303re/nxlines/defconfig
View File

@ -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

3
configs/open1788/nxlines/defconfig
View File

@ -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

3
configs/samv71-xult/mxtxplnd/defconfig
View File

@ -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

5
configs/sim/nxlines/defconfig
View File

@ -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

3
configs/stm32f4discovery/nxlines/defconfig
View File

@ -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

5
configs/zp214xpa/nxlines/defconfig
View File

@ -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

2
libnx/nxmu/nxmu_sendserver.c
View File

@ -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;