sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The nx example no longer supports single user mode.

Browse Source
This commit is contained in:
Gregory Nutt 2017-10-14 10:54:38 -06:00
parent 2dab490cee
commit 5907d3c6b6
19 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/hymini-stm32v/nsh2/defconfig
View File

@ -43,6 +43,8 @@ CONFIG_NFILE_STREAMS=8
CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONT_SANS28X37B=y CONFIG_NXFONT_SANS28X37B=y

2
configs/lm3s6965-ek/nx/defconfig
View File

@ -30,7 +30,9 @@ CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2 CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/lm3s8962-ek/nx/defconfig
View File

@ -30,7 +30,9 @@ CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2 CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/lpcxpresso-lpc1768/nx/defconfig
View File

@ -36,7 +36,9 @@ CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

4
configs/maple/nx/defconfig
View File

@ -1,9 +1,7 @@
# CONFIG_DEV_CONSOLE is not set # CONFIG_DEV_CONSOLE is not set
# CONFIG_DISABLE_OS_API is not set # CONFIG_DISABLE_OS_API is not set
# CONFIG_NSH_DISABLE_ADDROUTE is not set
# CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_CMP is not set
# CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_DD is not set
# CONFIG_NSH_DISABLE_DELROUTE is not set
# CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXEC is not set
# CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_EXIT is not set
# CONFIG_NSH_DISABLE_GET is not set # CONFIG_NSH_DISABLE_GET is not set
@ -50,6 +48,8 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_FILEIOSIZE=1024
CONFIG_NSH_LINELEN=80 CONFIG_NSH_LINELEN=80
CONFIG_NSH_USBCONSOLE=y CONFIG_NSH_USBCONSOLE=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_MONO5X8=y CONFIG_NXFONT_MONO5X8=y
CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_MQ_MSGS=4

2
configs/mikroe-stm32f4/nx/defconfig
View File

@ -38,6 +38,8 @@ CONFIG_NSH_LIBRARY=y
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NSH_STRERROR=y CONFIG_NSH_STRERROR=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXFONT_SERIF22X28B=y
CONFIG_NXTK_BORDERCOLOR1=0x8410 CONFIG_NXTK_BORDERCOLOR1=0x8410

2
configs/olimex-lpc1766stk/nx/defconfig
View File

@ -34,7 +34,9 @@ CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/sam3u-ek/nx/defconfig
View File

@ -35,7 +35,9 @@ CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/sama5d3x-ek/nx/defconfig
View File

@ -27,7 +27,9 @@ CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NFILE_STREAMS=8 CONFIG_NFILE_STREAMS=8
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXFONT_SERIF22X28B=y

4
configs/sama5d4-ek/ipv6/defconfig
View File

@ -18,13 +18,13 @@ CONFIG_ARCH_LOWVECTORS=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="arm" CONFIG_ARCH="arm"
CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_NUM_BUFFERS=8
CONFIG_AUDIO_WM8904=y CONFIG_AUDIO_WM8904=y
CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOARD_LOOPSPERMSEC=65775
CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_ETH0_PHY_KSZ8081=y CONFIG_ETH0_PHY_KSZ8081=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH=y
@ -79,7 +79,9 @@ CONFIG_NSH_NOMAC=y
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSETC=y CONFIG_NSH_ROMFSETC=y
CONFIG_NX_BGCOLOR=0x7b5d CONFIG_NX_BGCOLOR=0x7b5d
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXFONT_SERIF22X28B=y

4
configs/sama5d4-ek/nsh/defconfig
View File

@ -17,13 +17,13 @@ CONFIG_ARCH_LOWVECTORS=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="arm" CONFIG_ARCH="arm"
CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_NUM_BUFFERS=8
CONFIG_AUDIO_WM8904=y CONFIG_AUDIO_WM8904=y
CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOARD_LOOPSPERMSEC=65775
CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_ETH0_PHY_KSZ8081=y CONFIG_ETH0_PHY_KSZ8081=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH=y
@ -81,7 +81,9 @@ CONFIG_NSH_NOMAC=y
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSETC=y CONFIG_NSH_ROMFSETC=y
CONFIG_NX_BGCOLOR=0x7b5d CONFIG_NX_BGCOLOR=0x7b5d
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXFONT_SERIF22X28B=y

3
configs/sim/nsh2/defconfig
View File

@ -7,7 +7,6 @@ CONFIG_ARCH_SIM=y
CONFIG_ARCH="sim" CONFIG_ARCH="sim"
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH=y
@ -34,7 +33,9 @@ CONFIG_NSH_FATDEVNO=2
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSDEVNO=1 CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y CONFIG_NSH_ROMFSETC=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/sim/nx/defconfig
View File

@ -12,7 +12,9 @@ CONFIG_EXAMPLES_NX_BPP=8
CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX=y
CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/sim/nx11/defconfig
View File

@ -11,7 +11,9 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX=y
CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/stm3210e-eval/nsh2/defconfig
View File

@ -59,7 +59,9 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/stm3210e-eval/nx/defconfig
View File

@ -34,7 +34,9 @@ CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2 CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_DESCRIPTORS=12
CONFIG_NFILE_STREAMS=12 CONFIG_NFILE_STREAMS=12
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/stm3210e-eval/pm/defconfig
View File

@ -51,7 +51,9 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

2
configs/stm32f429i-disco/ltdc/defconfig
View File

@ -37,6 +37,8 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y CONFIG_NSH_READLINE=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_MULTIUSER=y
CONFIG_NX=y CONFIG_NX=y
CONFIG_NXFONT_MONO5X8=y CONFIG_NXFONT_MONO5X8=y
CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_MQ_MSGS=4

2
net/sixlowpan/sixlowpan_input.c
View File

@ -286,7 +286,7 @@ static int sixlowpan_frame_process(FAR struct radio_driver_s *radio,
uint16_t paysize; /* Size of the data payload */ uint16_t paysize; /* Size of the data payload */
uint16_t fragtag = 0; /* Tag of the fragment */ uint16_t fragtag = 0; /* Tag of the fragment */
uint8_t fragoffset = 0; /* Offset of the fragment in the IP packet */ uint8_t fragoffset = 0; /* Offset of the fragment in the IP packet */
uint8_t protosize = 0; /* Length of the protocal header (treated like payload) */ uint8_t protosize = 0; /* Length of the protocol header (treated like payload) */
bool isfrag = false; /* true: Frame is a fragment */ bool isfrag = false; /* true: Frame is a fragment */
bool isfrag1 = false; /* true: Frame is the first fragement of the series */ bool isfrag1 = false; /* true: Frame is the first fragement of the series */
int reqsize; /* Required buffer size */ int reqsize; /* Required buffer size */