Network: Update SLIP configuration; Fix compile issues when building SLIP only

This commit is contained in:
Gregory Nutt
2014-11-15 14:36:49 -06:00
parent daa94934eb
commit 51adb90e9a
3 changed files with 117 additions and 46 deletions
+115 -17
View File
@@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y
# Build Configuration # Build Configuration
# #
# CONFIG_APPS_DIR="../apps" # CONFIG_APPS_DIR="../apps"
CONFIG_BUILD_FLAT=y
# CONFIG_BUILD_2PASS is not set # CONFIG_BUILD_2PASS is not set
# #
@@ -71,6 +72,7 @@ CONFIG_ARCH="arm"
# CONFIG_ARCH_CHIP_C5471 is not set # CONFIG_ARCH_CHIP_C5471 is not set
# CONFIG_ARCH_CHIP_CALYPSO is not set # CONFIG_ARCH_CHIP_CALYPSO is not set
# CONFIG_ARCH_CHIP_DM320 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_IMX is not set
# CONFIG_ARCH_CHIP_KINETIS is not set # CONFIG_ARCH_CHIP_KINETIS is not set
# CONFIG_ARCH_CHIP_KL is not set # CONFIG_ARCH_CHIP_KL is not set
@@ -101,7 +103,6 @@ CONFIG_ARCH_CHIP="lpc17xx"
CONFIG_ARCH_HAVE_CMNVECTOR=y CONFIG_ARCH_HAVE_CMNVECTOR=y
# CONFIG_ARMV7M_CMNVECTOR is not set # CONFIG_ARMV7M_CMNVECTOR is not set
# CONFIG_ARCH_HAVE_FPU is not set # CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
# #
@@ -112,6 +113,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
# CONFIG_ARMV7M_OABI_TOOLCHAIN is not set # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
# CONFIG_ARMV7M_ITMSYSLOG is not set
# CONFIG_GPIO_IRQ is not set # CONFIG_GPIO_IRQ is not set
# #
@@ -169,6 +171,7 @@ CONFIG_LPC17_UART1=y
# CONFIG_LPC17_TMR3 is not set # CONFIG_LPC17_TMR3 is not set
# CONFIG_LPC17_RIT is not set # CONFIG_LPC17_RIT is not set
# CONFIG_LPC17_PWM0 is not set # CONFIG_LPC17_PWM0 is not set
# CONFIG_LPC17_PWM1 is not set
# CONFIG_LPC17_MCPWM is not set # CONFIG_LPC17_MCPWM is not set
# CONFIG_LPC17_QEI is not set # CONFIG_LPC17_QEI is not set
# CONFIG_LPC17_RTC is not set # CONFIG_LPC17_RTC is not set
@@ -185,7 +188,6 @@ CONFIG_LPC17_UART1=y
# #
# Serial driver options # Serial driver options
# #
# CONFIG_SERIAL_TERMIOS is not set
# CONFIG_UART1_RINGINDICATOR is not set # CONFIG_UART1_RINGINDICATOR is not set
# CONFIG_NET_MULTICAST is not set # CONFIG_NET_MULTICAST is not set
@@ -196,10 +198,16 @@ CONFIG_LPC17_UART1=y
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
# CONFIG_ARCH_DMA is not set # CONFIG_ARCH_DMA is not set
CONFIG_ARCH_HAVE_IRQPRIO=y CONFIG_ARCH_HAVE_IRQPRIO=y
# CONFIG_ARCH_ADDRENV is not set # CONFIG_ARCH_L2CACHE 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_VFORK=y
# CONFIG_ARCH_HAVE_MMU is not set # CONFIG_ARCH_HAVE_MMU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARCH_NAND_HWECC is not set # 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_IRQPRIO is not set
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set # CONFIG_ENDIAN_BIG is not set
@@ -286,6 +294,9 @@ CONFIG_PREALLOC_TIMERS=8
# #
# Tasks and Scheduling # Tasks and Scheduling
# #
# CONFIG_INIT_NONE is not set
CONFIG_INIT_ENTRYPOINT=y
# CONFIG_INIT_FILEPATH is not set
CONFIG_USER_ENTRYPOINT="thttp_main" CONFIG_USER_ENTRYPOINT="thttp_main"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_NAME_SIZE=0
@@ -326,6 +337,13 @@ CONFIG_SIG_SIGUSR1=1
CONFIG_SIG_SIGUSR2=2 CONFIG_SIG_SIGUSR2=2
CONFIG_SIG_SIGALARM=3 CONFIG_SIG_SIGALARM=3
#
# Work Queue Support
#
# CONFIG_SCHED_WORKQUEUE is not set
# CONFIG_SCHED_HPWORK is not set
# CONFIG_SCHED_LPWORK is not set
# #
# Stack and heap information # Stack and heap information
# #
@@ -333,6 +351,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USERMAIN_STACKSIZE=8192
CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_PTHREAD_STACK_DEFAULT=2048
# CONFIG_LIB_SYSCALL is not set
# #
# Device Drivers # Device Drivers
@@ -341,6 +360,12 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_DEV_NULL=y CONFIG_DEV_NULL=y
# CONFIG_DEV_ZERO is not set # CONFIG_DEV_ZERO is not set
# CONFIG_LOOP is not set # CONFIG_LOOP is not set
#
# Buffering
#
# CONFIG_DRVR_WRITEBUFFER is not set
# CONFIG_DRVR_READAHEAD is not set
# CONFIG_RAMDISK is not set # CONFIG_RAMDISK is not set
# CONFIG_CAN is not set # CONFIG_CAN is not set
# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
@@ -351,6 +376,7 @@ CONFIG_DEV_NULL=y
# CONFIG_I2S is not set # CONFIG_I2S is not set
# CONFIG_RTC is not set # CONFIG_RTC is not set
# CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG is not set
# CONFIG_TIMER is not set
# CONFIG_ANALOG is not set # CONFIG_ANALOG is not set
# CONFIG_AUDIO_DEVICES is not set # CONFIG_AUDIO_DEVICES is not set
# CONFIG_VIDEO_DEVICES is not set # CONFIG_VIDEO_DEVICES is not set
@@ -390,6 +416,7 @@ CONFIG_ARCH_HAVE_UART1=y
# CONFIG_ARCH_HAVE_USART6 is not set # CONFIG_ARCH_HAVE_USART6 is not set
# CONFIG_ARCH_HAVE_USART7 is not set # CONFIG_ARCH_HAVE_USART7 is not set
# CONFIG_ARCH_HAVE_USART8 is not set # CONFIG_ARCH_HAVE_USART8 is not set
# CONFIG_ARCH_HAVE_OTHER_UART is not set
# #
# USART Configuration # USART Configuration
@@ -397,8 +424,11 @@ CONFIG_ARCH_HAVE_UART1=y
CONFIG_MCU_SERIAL=y CONFIG_MCU_SERIAL=y
CONFIG_STANDARD_SERIAL=y CONFIG_STANDARD_SERIAL=y
CONFIG_SERIAL_NPOLLWAITERS=2 CONFIG_SERIAL_NPOLLWAITERS=2
CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
# CONFIG_SERIAL_TERMIOS is not set
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
# CONFIG_UART1_SERIAL_CONSOLE is not set # CONFIG_UART1_SERIAL_CONSOLE is not set
# CONFIG_OTHER_SERIAL_CONSOLE is not set
# CONFIG_NO_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set
# #
@@ -448,17 +478,42 @@ CONFIG_NET=y
CONFIG_NET_NOINTS=y CONFIG_NET_NOINTS=y
CONFIG_NET_MULTIBUFFER=y CONFIG_NET_MULTIBUFFER=y
# CONFIG_NET_PROMISCUOUS is not set # CONFIG_NET_PROMISCUOUS is not set
CONFIG_NET_BUFSIZE=296
CONFIG_NET_RECEIVE_WINDOW=256
CONFIG_NET_GUARDSIZE=2
#
# Data link support
#
# CONFIG_NET_MULTILINK is not set
# CONFIG_NET_ETHERNET is not set
CONFIG_SLIP_NINTERFACES=1
CONFIG_SLIP_STACKSIZE=2048
CONFIG_SLIP_DEFPRIO=128
#
# Socket Support
#
CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NSOCKET_DESCRIPTORS=16
CONFIG_NET_NACTIVESOCKETS=16 CONFIG_NET_NACTIVESOCKETS=16
CONFIG_NET_SOCKOPTS=y CONFIG_NET_SOCKOPTS=y
# CONFIG_NET_SOLINGER is not set # CONFIG_NET_SOLINGER is not set
CONFIG_NET_BUFSIZE=296
# CONFIG_NET_TCPURGDATA is not set #
# Network Device Operations
#
# CONFIG_NETDEV_PHY_IOCTL is not set
#
# Raw Socket Support
#
# CONFIG_NET_PKT is not set
# #
# TCP/IP Networking # TCP/IP Networking
# #
CONFIG_NET_TCP=y CONFIG_NET_TCP=y
# CONFIG_NET_TCPURGDATA is not set
CONFIG_NET_TCP_CONNS=16 CONFIG_NET_TCP_CONNS=16
CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_MAX_LISTENPORTS=8
CONFIG_NET_TCP_READAHEAD=y CONFIG_NET_TCP_READAHEAD=y
@@ -472,23 +527,43 @@ CONFIG_NET_TCPBACKLOG=y
# UDP Networking # UDP Networking
# #
# CONFIG_NET_UDP is not set # CONFIG_NET_UDP is not set
#
# ICMP Networking Support
#
CONFIG_NET_ICMP=y CONFIG_NET_ICMP=y
# CONFIG_NET_ICMP_PING is not set # CONFIG_NET_ICMP_PING is not set
# CONFIG_NET_PINGADDRCONF is not set # CONFIG_NET_PINGADDRCONF is not set
#
# IGMPv2 Client Support
#
# CONFIG_NET_IGMP is not set # CONFIG_NET_IGMP is not set
# CONFIG_NET_STATISTICS is not set
CONFIG_NET_RECEIVE_WINDOW=256 #
CONFIG_NET_ARPTAB_SIZE=16 # ARP Configuration
# CONFIG_NET_ARP_IPIN is not set #
#
# Network I/O Buffer Support
#
CONFIG_NET_IOB=y CONFIG_NET_IOB=y
CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_BUFSIZE=196
CONFIG_IOB_NCHAINS=8 CONFIG_IOB_NCHAINS=8
CONFIG_IOB_THROTTLE=0 # CONFIG_NET_ARCH_INCR32 is not set
# CONFIG_NET_ARCH_CHKSUM is not set
# CONFIG_NET_STATISTICS is not set
#
# Routing Table Configuration
#
# CONFIG_NET_ROUTE is not set # CONFIG_NET_ROUTE is not set
CONFIG_SLIP_NINTERFACES=1
CONFIG_SLIP_STACKSIZE=2048 #
CONFIG_SLIP_DEFPRIO=128 # Crypto API
#
# CONFIG_CRYPTO is not set
# #
# File Systems # File Systems
@@ -498,9 +573,11 @@ CONFIG_SLIP_DEFPRIO=128
# File system configuration # File system configuration
# #
# CONFIG_DISABLE_MOUNTPOINT is not set # CONFIG_DISABLE_MOUNTPOINT is not set
# CONFIG_FS_AUTOMOUNTER is not set
# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
CONFIG_FS_READABLE=y CONFIG_FS_READABLE=y
# CONFIG_FS_WRITABLE is not set # CONFIG_FS_WRITABLE is not set
# CONFIG_FS_NAMED_SEMAPHORES is not set
# CONFIG_FS_RAMMAP is not set # CONFIG_FS_RAMMAP is not set
# CONFIG_FS_FAT is not set # CONFIG_FS_FAT is not set
# CONFIG_NFS is not set # CONFIG_NFS is not set
@@ -512,8 +589,8 @@ CONFIG_FS_ROMFS=y
# #
# System Logging # System Logging
# #
# CONFIG_SYSLOG is not set # CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
# #
# Graphics Support # Graphics Support
@@ -534,7 +611,7 @@ CONFIG_MM_REGIONS=2
# CONFIG_AUDIO is not set # CONFIG_AUDIO is not set
# #
# Binary Formats # Binary Loader
# #
# CONFIG_BINFMT_DISABLE is not set # CONFIG_BINFMT_DISABLE is not set
# CONFIG_BINFMT_EXEPATH is not set # CONFIG_BINFMT_EXEPATH is not set
@@ -569,6 +646,7 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
# CONFIG_LIBC_STRERROR is not set # CONFIG_LIBC_STRERROR is not set
# CONFIG_LIBC_PERROR_STDOUT is not set # CONFIG_LIBC_PERROR_STDOUT is not set
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
# CONFIG_LIBC_LOCALTIME is not set
CONFIG_LIB_SENDFILE_BUFSIZE=512 CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_ARCH_ROMGETC is not set # CONFIG_ARCH_ROMGETC is not set
# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -576,7 +654,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# Non-standard Library Support # Non-standard Library Support
# #
# CONFIG_SCHED_WORKQUEUE is not set
# CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_KBDCODEC is not set
# CONFIG_LIB_SLCDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set
@@ -600,6 +677,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_CONFIGDATA is not set # CONFIG_EXAMPLES_CONFIGDATA is not set
# CONFIG_EXAMPLES_CPUHOG is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
@@ -626,7 +704,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
# CONFIG_EXAMPLES_OSTEST is not set # CONFIG_EXAMPLES_OSTEST is not set
# CONFIG_EXAMPLES_PASHELLO is not set
# CONFIG_EXAMPLES_PIPE is not set # CONFIG_EXAMPLES_PIPE is not set
# CONFIG_EXAMPLES_POLL is not set # CONFIG_EXAMPLES_POLL is not set
# CONFIG_EXAMPLES_POSIXSPAWN is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set
@@ -634,6 +711,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_RGMP is not set # CONFIG_EXAMPLES_RGMP is not set
# CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_ROMFS is not set
# CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SENDMAIL is not set
# CONFIG_EXAMPLES_SERIALBLASTER is not set
# CONFIG_EXAMPLES_SERIALRX is not set
# CONFIG_EXAMPLES_SERLOOP is not set # CONFIG_EXAMPLES_SERLOOP is not set
# CONFIG_EXAMPLES_SLCD is not set # CONFIG_EXAMPLES_SLCD is not set
# CONFIG_EXAMPLES_SMART is not set # CONFIG_EXAMPLES_SMART is not set
@@ -662,6 +741,7 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
# Interpreters # Interpreters
# #
# CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_FICL is not set
# CONFIG_INTERPRETERS_BAS is not set
# CONFIG_INTERPRETERS_PCODE is not set # CONFIG_INTERPRETERS_PCODE is not set
# #
@@ -757,6 +837,11 @@ CONFIG_NETUTILS_NETLIB=y
# FLASH Erase-all Command # FLASH Erase-all Command
# #
#
# Intel HEX to binary conversion
#
# CONFIG_SYSTEM_HEX2BIN is not set
# #
# I2C tool # I2C tool
# #
@@ -781,6 +866,14 @@ CONFIG_NETUTILS_NETLIB=y
# #
# CONFIG_SYSTEM_READLINE is not set # CONFIG_SYSTEM_READLINE is not set
#
# P-Code Support
#
#
# PHY Tool
#
# #
# Power Off # Power Off
# #
@@ -796,6 +889,11 @@ CONFIG_NETUTILS_NETLIB=y
# #
# CONFIG_SYSTEM_SDCARD is not set # CONFIG_SYSTEM_SDCARD is not set
#
# Sudoku
#
# CONFIG_SYSTEM_SUDOKU is not set
# #
# Sysinfo # Sysinfo
# #
-28
View File
@@ -186,31 +186,6 @@ void arp_arpin(struct net_driver_s *dev);
void arp_out(FAR struct net_driver_s *dev); void arp_out(FAR struct net_driver_s *dev);
/****************************************************************************
* Name: arp_update
*
* Description:
* Add the IP/HW address mapping to the ARP table -OR- change the IP
* address of an existing association.
*
* NOTE: This is an internal interface withint the networking layer and
* should not be used by application software. This prototype is here
* because there is already a violation of this structureing: The
* apps/netutils/dhcpd logic currently calls arp_update() directly. That
* is bad and needs to be replace with some ioctl interface perhaps hidden
* somewhere in apps/netutils/netlib.
*
* Input parameters:
* pipaddr - Refers to an IP address uint16_t[2] in network order
* ethaddr - Refers to a HW address uint8_t[IFHWADDRLEN]
*
* Assumptions
* Interrupts are disabled to assure exclusive access to the ARP table.
*
****************************************************************************/
void arp_update(FAR uint16_t *pipaddr, FAR uint8_t *ethaddr);
#else /* CONFIG_NET_ARP */ #else /* CONFIG_NET_ARP */
/* If ARP is disabled, stub out all ARP interfaces */ /* If ARP is disabled, stub out all ARP interfaces */
@@ -218,9 +193,6 @@ void arp_update(FAR uint16_t *pipaddr, FAR uint8_t *ethaddr);
# define arp_ipin(dev) # define arp_ipin(dev)
# define arp_arpin(dev) # define arp_arpin(dev)
# define arp_out(dev) # define arp_out(dev)
# define arp_find(ipaddr) NULL
# define arp_delete(ipaddr)
# define arp_update(pipaddr,ethaddr)
#endif /* CONFIG_NET_ARP */ #endif /* CONFIG_NET_ARP */
+2 -1
View File
@@ -96,7 +96,8 @@ config NET_MULTILINK
config NET_ETHERNET config NET_ETHERNET
bool "Ethernet support" bool "Ethernet support"
default y default y if !NET_SLIP
default n if NET_SLIP
select NETDEV_MULTINIC if NET_SLIP select NETDEV_MULTINIC if NET_SLIP
select NET_MULTILINK if NET_SLIP select NET_MULTILINK if NET_SLIP
---help--- ---help---