diff options
| -rw-r--r-- | nuttx/configs/sim/ustream/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/viewtool-stm32f107/netnsh/defconfig | 126 | ||||
| -rw-r--r-- | nuttx/net/local/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/net/socket/accept.c | 2 |
4 files changed, 107 insertions, 25 deletions
diff --git a/nuttx/configs/sim/ustream/defconfig b/nuttx/configs/sim/ustream/defconfig index 4995c6069..935043376 100644 --- a/nuttx/configs/sim/ustream/defconfig +++ b/nuttx/configs/sim/ustream/defconfig @@ -6,7 +6,7 @@ # # Build Setup # -CONFIG_EXPERIMENTAL=y +# CONFIG_EXPERIMENTAL is not set # CONFIG_DEFAULT_SMALL is not set CONFIG_HOST_LINUX=y # CONFIG_HOST_OSX is not set diff --git a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig index 4db8877ae..b3d70a06f 100644 --- a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig +++ b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig @@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y # Build Configuration # # CONFIG_APPS_DIR="../apps" +CONFIG_BUILD_FLAT=y # CONFIG_BUILD_2PASS is not set # @@ -45,8 +46,9 @@ CONFIG_INTELHEX_BINARY=y # Debug Options # # CONFIG_DEBUG is not set -CONFIG_ARCH_HAVE_STACKCHECK=y CONFIG_ARCH_HAVE_HEAPCHECK=y +CONFIG_ARCH_HAVE_STACKCHECK=y +# CONFIG_STACK_COLORATION is not set # CONFIG_DEBUG_SYMBOLS is not set CONFIG_ARCH_HAVE_CUSTOMOPT=y # CONFIG_DEBUG_NOOPT is not set @@ -75,6 +77,7 @@ CONFIG_ARCH="arm" # CONFIG_ARCH_CHIP_C5471 is not set # CONFIG_ARCH_CHIP_CALYPSO is not set # CONFIG_ARCH_CHIP_DM320 is not set +# CONFIG_ARCH_CHIP_EFM32 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set # CONFIG_ARCH_CHIP_KL is not set @@ -105,7 +108,6 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set # CONFIG_ARCH_HAVE_FPU is not set -CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set # @@ -119,7 +121,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set -# CONFIG_SERIAL_TERMIOS is not set +# CONFIG_ARMV7M_STACKCHECK is not set +# CONFIG_ARMV7M_ITMSYSLOG is not set # CONFIG_NET_MULTICAST is not set # @@ -156,6 +159,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y # CONFIG_ARCH_CHIP_STM32F100VC is not set # CONFIG_ARCH_CHIP_STM32F100VD is not set # CONFIG_ARCH_CHIP_STM32F100VE is not set +# CONFIG_ARCH_CHIP_STM32F102CB is not set # CONFIG_ARCH_CHIP_STM32F103T8 is not set # CONFIG_ARCH_CHIP_STM32F103TB is not set # CONFIG_ARCH_CHIP_STM32F103C4 is not set @@ -166,6 +170,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y # CONFIG_ARCH_CHIP_STM32F103RC is not set # CONFIG_ARCH_CHIP_STM32F103RD is not set # CONFIG_ARCH_CHIP_STM32F103RE is not set +# CONFIG_ARCH_CHIP_STM32F103RG is not set # CONFIG_ARCH_CHIP_STM32F103V8 is not set # CONFIG_ARCH_CHIP_STM32F103VB is not set # CONFIG_ARCH_CHIP_STM32F103VC is not set @@ -188,6 +193,7 @@ CONFIG_ARCH_CHIP_STM32F107VC=y # CONFIG_ARCH_CHIP_STM32F303VB is not set # CONFIG_ARCH_CHIP_STM32F303VC is not set # CONFIG_ARCH_CHIP_STM32F401RE is not set +# CONFIG_ARCH_CHIP_STM32F411RE is not set # CONFIG_ARCH_CHIP_STM32F405RG is not set # CONFIG_ARCH_CHIP_STM32F405VG is not set # CONFIG_ARCH_CHIP_STM32F405ZG is not set @@ -211,6 +217,7 @@ CONFIG_STM32_STM32F10XX=y # CONFIG_STM32_VALUELINE is not set CONFIG_STM32_CONNECTIVITYLINE=y # CONFIG_STM32_PERFORMANCELINE is not set +# CONFIG_STM32_USBACCESSLINE is not set # CONFIG_STM32_HIGHDENSITY is not set # CONFIG_STM32_MEDIUMDENSITY is not set # CONFIG_STM32_LOWDENSITY is not set @@ -219,6 +226,7 @@ CONFIG_STM32_CONNECTIVITYLINE=y # CONFIG_STM32_STM32F30XX is not set # CONFIG_STM32_STM32F40XX is not set # CONFIG_STM32_STM32F401 is not set +# CONFIG_STM32_STM32F411 is not set # CONFIG_STM32_STM32F405 is not set # CONFIG_STM32_STM32F407 is not set # CONFIG_STM32_STM32F427 is not set @@ -259,6 +267,10 @@ CONFIG_STM32_HAVE_CAN1=y CONFIG_STM32_HAVE_CAN2=y # CONFIG_STM32_HAVE_RNG is not set CONFIG_STM32_HAVE_ETHMAC=y +CONFIG_STM32_HAVE_SPI2=y +CONFIG_STM32_HAVE_SPI3=y +# CONFIG_STM32_HAVE_SPI4 is not set +# CONFIG_STM32_HAVE_SPI5 is not set # CONFIG_STM32_ADC1 is not set # CONFIG_STM32_ADC2 is not set # CONFIG_STM32_BKP is not set @@ -312,6 +324,7 @@ CONFIG_STM32_USART=y # # CONFIG_USART1_RS485 is not set # CONFIG_SERIAL_DISABLE_REORDERING is not set +# CONFIG_STM32_FLOWCONTROL_BROKEN is not set # CONFIG_STM32_USART_SINGLEWIRE is not set # @@ -333,7 +346,15 @@ CONFIG_STM32_RMII=y CONFIG_STM32_RMII_EXTCLK=y # -# USB Host Configuration +# USB FS Host Configuration +# + +# +# USB HS Host Configuration +# + +# +# USB Host Debug Configuration # # @@ -348,11 +369,15 @@ CONFIG_STM32_RMII_EXTCLK=y # CONFIG_ARCH_DMA is not set CONFIG_ARCH_HAVE_IRQPRIO=y # CONFIG_ARCH_L2CACHE is not set -# CONFIG_ARCH_ADDRENV is not set +# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set +# CONFIG_ARCH_HAVE_ADDRENV is not set +# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set CONFIG_ARCH_HAVE_VFORK=y # CONFIG_ARCH_HAVE_MMU is not set +CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARCH_NAND_HWECC is not set # CONFIG_ARCH_HAVE_EXTCLK is not set +# CONFIG_ARCH_USE_MPU is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set @@ -442,6 +467,9 @@ CONFIG_PREALLOC_TIMERS=4 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 @@ -497,12 +525,23 @@ CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_MQ_MAXMSGSIZE=32 # +# Work Queue Support +# +CONFIG_SCHED_WORKQUEUE=y +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_HPWORKPRIORITY=192 +CONFIG_SCHED_HPWORKPERIOD=50000 +CONFIG_SCHED_HPWORKSTACKSIZE=1024 +# CONFIG_SCHED_LPWORK is not set + +# # Stack and heap information # CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 +# CONFIG_LIB_SYSCALL is not set # # Device Drivers @@ -536,6 +575,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_LCD is not set # CONFIG_MMCSD is not set # CONFIG_MTD is not set +# CONFIG_EEPROM is not set CONFIG_NETDEVICES=y # @@ -595,6 +635,7 @@ CONFIG_ARCH_HAVE_USART1=y # CONFIG_ARCH_HAVE_USART6 is not set # CONFIG_ARCH_HAVE_USART7 is not set # CONFIG_ARCH_HAVE_USART8 is not set +# CONFIG_ARCH_HAVE_OTHER_UART is not set # # USART Configuration @@ -603,7 +644,12 @@ CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set +CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y +# CONFIG_SERIAL_TERMIOS is not set CONFIG_USART1_SERIAL_CONSOLE=y +# CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set # @@ -617,8 +663,6 @@ CONFIG_USART1_PARITY=0 CONFIG_USART1_2STOP=0 # CONFIG_USART1_IFLOWCONTROL is not set # CONFIG_USART1_OFLOWCONTROL is not set -# CONFIG_SERIAL_IFLOWCONTROL is not set -# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set @@ -639,14 +683,34 @@ CONFIG_ARCH_HAVE_NET=y CONFIG_ARCH_HAVE_PHY=y CONFIG_NET=y # CONFIG_NET_NOINTS is not set -CONFIG_NET_IPv4=y -CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_PROMISCUOUS is not set + +# +# Driver buffer configuration +# +CONFIG_NET_MULTIBUFFER=y CONFIG_NET_ETH_MTU=650 CONFIG_NET_ETH_TCP_RECVWNDO=624 CONFIG_NET_GUARDSIZE=2 # +# Data link support +# +# CONFIG_NET_MULTILINK is not set +CONFIG_NET_ETHERNET=y + +# +# Network Device Operations +# +# CONFIG_NETDEV_PHY_IOCTL is not set + +# +# Internet Protocol Selection +# +CONFIG_NET_IPv4=y +# CONFIG_NET_IPv6 is not set + +# # Socket Support # CONFIG_NSOCKET_DESCRIPTORS=10 @@ -655,14 +719,14 @@ CONFIG_NET_SOCKOPTS=y # CONFIG_NET_SOLINGER is not set # -# Network Device Operations +# Raw Socket Support # -# CONFIG_NETDEV_PHY_IOCTL is not set +# CONFIG_NET_PKT is not set # -# Raw Socket Support +# Unix Domain Socket Support # -# CONFIG_NET_PKT is not set +# CONFIG_NET_LOCAL is not set # # TCP/IP Networking @@ -726,7 +790,6 @@ CONFIG_IOB_THROTTLE=8 # Routing Table Configuration # # CONFIG_NET_ROUTE is not set -CONFIG_NET_ETHERNET=y # # Crypto API @@ -745,6 +808,8 @@ CONFIG_NET_ETHERNET=y # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set # CONFIG_FS_READABLE is not set # CONFIG_FS_WRITABLE is not set +# CONFIG_FS_NAMED_SEMAPHORES is not set +CONFIG_FS_MQUEUE_MPATH="/var/mqueue" # CONFIG_FS_RAMMAP is not set # CONFIG_FS_FAT is not set # CONFIG_NFS is not set @@ -757,8 +822,8 @@ CONFIG_NET_ETHERNET=y # # System Logging # - # CONFIG_SYSLOG is not set +# CONFIG_SYSLOG_TIMESTAMP is not set # # Graphics Support @@ -779,7 +844,7 @@ CONFIG_MM_REGIONS=1 # CONFIG_AUDIO is not set # -# Binary Formats +# Binary Loader # # CONFIG_BINFMT_DISABLE is not set # CONFIG_BINFMT_EXEPATH is not set @@ -803,6 +868,7 @@ CONFIG_LIB_HOMEDIR="/" # CONFIG_LIBM is not set # CONFIG_NOPRINTF_FIELDWIDTH is not set # CONFIG_LIBC_FLOATINGPOINT is not set +# CONFIG_LIBC_IOCTL_VARIADIC is not set CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set @@ -822,12 +888,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # # Non-standard Library Support # -CONFIG_SCHED_WORKQUEUE=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_HPWORKPERIOD=50000 -CONFIG_SCHED_HPWORKSTACKSIZE=1024 -# CONFIG_SCHED_LPWORK is not set # CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set @@ -908,12 +968,14 @@ CONFIG_EXAMPLES_NSH=y # Graphics Support # # CONFIG_TIFF is not set +# CONFIG_GRAPHICS_TRAVELER is not set # # Interpreters # # CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_PCODE is not set +# CONFIG_INTERPRETERS_MICROPYTHON is not set # # Network Utilities @@ -929,6 +991,7 @@ CONFIG_NETUTILS_DHCPC=y # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set CONFIG_NETUTILS_DNSCLIENT=y +CONFIG_NETUTILS_DNSCLIENT_IPv4=y CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8 CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96 # CONFIG_NETUTILS_SMTP is not set @@ -938,6 +1001,7 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)" +CONFIG_WEBCLIENT_TIMEOUT=10 # CONFIG_NETUTILS_WEBSERVER is not set # CONFIG_NETUTILS_NTPCLIENT is not set # CONFIG_NETUTILS_DISCOVER is not set @@ -1039,7 +1103,15 @@ CONFIG_NSH_CONSOLE=y CONFIG_NSH_NETINIT_THREAD=y CONFIG_NSH_NETINIT_THREAD_STACKSIZE=1568 CONFIG_NSH_NETINIT_THREAD_PRIORITY=100 + +# +# IP Address Configuration +# # CONFIG_NSH_DHCPC is not set + +# +# IPv4 Addresses +# CONFIG_NSH_IPADDR=0x0a000002 CONFIG_NSH_DRIPADDR=0x0a000001 CONFIG_NSH_NETMASK=0xffffff00 @@ -1086,6 +1158,11 @@ CONFIG_NSH_IOBUFFER_SIZE=512 # CONFIG_SYSTEM_CLE is not set # +# CU Minimal Terminal +# +# CONFIG_SYSTEM_CUTERM is not set + +# # FLASH Program Installation # # CONFIG_SYSTEM_INSTALL is not set @@ -1111,7 +1188,6 @@ CONFIG_NSH_IOBUFFER_SIZE=512 # # NxPlayer media player library / command Line # -# CONFIG_SYSTEM_NXPLAYER is not set # # RAM test @@ -1158,6 +1234,10 @@ CONFIG_READLINE_ECHO=y # CONFIG_SYSTEM_SYSINFO is not set # +# Temperature +# + +# # VI Work-Alike Editor # # CONFIG_SYSTEM_VI is not set diff --git a/nuttx/net/local/Kconfig b/nuttx/net/local/Kconfig index 2f720c348..73d0f80e7 100644 --- a/nuttx/net/local/Kconfig +++ b/nuttx/net/local/Kconfig @@ -4,7 +4,7 @@ # menu "Unix Domain Socket Support" - depends on NET && EXPERIMENTAL + depends on NET config NET_LOCAL bool "Unix domain (local) sockets" diff --git a/nuttx/net/socket/accept.c b/nuttx/net/socket/accept.c index 65a164434..e73f77228 100644 --- a/nuttx/net/socket/accept.c +++ b/nuttx/net/socket/accept.c @@ -48,6 +48,8 @@ #include <assert.h> #include <debug.h> +#include <arch/irq.h> + #include "tcp/tcp.h" #include "local/local.h" #include "socket/socket.h" |