From 5907d3c6b6b9df93dd97a84f06c660e37ee75bfd Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 14 Oct 2017 10:54:38 -0600 Subject: [PATCH] The nx example no longer supports single user mode. --- configs/hymini-stm32v/nsh2/defconfig | 2 ++ configs/lm3s6965-ek/nx/defconfig | 2 ++ configs/lm3s8962-ek/nx/defconfig | 2 ++ configs/lpcxpresso-lpc1768/nx/defconfig | 2 ++ configs/maple/nx/defconfig | 4 ++-- configs/mikroe-stm32f4/nx/defconfig | 2 ++ configs/olimex-lpc1766stk/nx/defconfig | 2 ++ configs/sam3u-ek/nx/defconfig | 2 ++ configs/sama5d3x-ek/nx/defconfig | 2 ++ configs/sama5d4-ek/ipv6/defconfig | 4 +++- configs/sama5d4-ek/nsh/defconfig | 4 +++- configs/sim/nsh2/defconfig | 3 ++- configs/sim/nx/defconfig | 2 ++ configs/sim/nx11/defconfig | 2 ++ configs/stm3210e-eval/nsh2/defconfig | 2 ++ configs/stm3210e-eval/nx/defconfig | 2 ++ configs/stm3210e-eval/pm/defconfig | 2 ++ configs/stm32f429i-disco/ltdc/defconfig | 2 ++ net/sixlowpan/sixlowpan_input.c | 2 +- 19 files changed, 39 insertions(+), 6 deletions(-) diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index 1f57f48011..e72c717fcc 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -43,6 +43,8 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index d20c66854f..cae414e879 100644 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -30,7 +30,9 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index f382a70c78..db2eb10aff 100644 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -30,7 +30,9 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index 4b3eee8152..53f34eae38 100644 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -36,7 +36,9 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index 39d30ee768..ba36b3a614 100644 --- a/configs/maple/nx/defconfig +++ b/configs/maple/nx/defconfig @@ -1,9 +1,7 @@ # CONFIG_DEV_CONSOLE 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_DD is not set -# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT 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_LINELEN=80 CONFIG_NSH_USBCONSOLE=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig index 3c2f129480..26132516d9 100644 --- a/configs/mikroe-stm32f4/nx/defconfig +++ b/configs/mikroe-stm32f4/nx/defconfig @@ -38,6 +38,8 @@ CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_MULTIUSER=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXTK_BORDERCOLOR1=0x8410 diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig index 27a1c245c0..a6361ca3ba 100644 --- a/configs/olimex-lpc1766stk/nx/defconfig +++ b/configs/olimex-lpc1766stk/nx/defconfig @@ -34,7 +34,9 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index e2cebe0da1..7f9204cd31 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -35,7 +35,9 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index b58cc5776c..40b0fb278d 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -27,7 +27,9 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig index 7f575fd3be..b0b862e09a 100644 --- a/configs/sama5d4-ek/ipv6/defconfig +++ b/configs/sama5d4-ek/ipv6/defconfig @@ -18,13 +18,13 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y +CONFIG_DRIVERS_AUDIO=y CONFIG_ETH0_PHY_KSZ8081=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y @@ -79,7 +79,9 @@ CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_NX_BGCOLOR=0x7b5d +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 517ae5994e..0032337100 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -17,13 +17,13 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y +CONFIG_DRIVERS_AUDIO=y CONFIG_ETH0_PHY_KSZ8081=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y @@ -81,7 +81,9 @@ CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_NX_BGCOLOR=0x7b5d +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig index 786e2d0d49..8ea4a67ea5 100644 --- a/configs/sim/nsh2/defconfig +++ b/configs/sim/nsh2/defconfig @@ -7,7 +7,6 @@ CONFIG_ARCH_SIM=y CONFIG_ARCH="sim" CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y -CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_EXAMPLES_NSH=y @@ -34,7 +33,9 @@ CONFIG_NSH_FATDEVNO=2 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 diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 85a95c93b1..a007b6707b 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -12,7 +12,9 @@ CONFIG_EXAMPLES_NX_BPP=8 CONFIG_EXAMPLES_NX=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_MAX_TASKS=16 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig index f86f17e04d..edc45d2ede 100644 --- a/configs/sim/nx11/defconfig +++ b/configs/sim/nx11/defconfig @@ -11,7 +11,9 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_EXAMPLES_NX=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_MAX_TASKS=16 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index ccf141c075..de572129ba 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -59,7 +59,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 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_SANS23X27=y diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index 57b3c5acf2..53a1df6dee 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -34,7 +34,9 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index 3e8eefc9a1..28fef2ce8e 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -51,7 +51,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y +CONFIG_NX_MULTIUSER=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig index 2e7529e436..df76836d29 100644 --- a/configs/stm32f429i-disco/ltdc/defconfig +++ b/configs/stm32f429i-disco/ltdc/defconfig @@ -37,6 +37,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_MONO5X8=y CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/net/sixlowpan/sixlowpan_input.c b/net/sixlowpan/sixlowpan_input.c index 9890c8a547..7d3d9aa68c 100644 --- a/net/sixlowpan/sixlowpan_input.c +++ b/net/sixlowpan/sixlowpan_input.c @@ -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 fragtag = 0; /* Tag of the fragment */ 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 isfrag1 = false; /* true: Frame is the first fragement of the series */ int reqsize; /* Required buffer size */