Fix apps/netutils/webclient build problem

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5317 42af7a65-404d-4744-a932-0658087f49c3

apps/examples/ostest/Kconfig

@@ -43,7 +43,6 @@ config EXAMPLES_OSTEST_RR_RANGE
 	int "Round-robin test - end of search range"
 	default 10000
 	range 1 32767
-	depends on RR_INTERVAL > 0
 	---help---
 		During round-robin scheduling test two threads are created. Each of the threads
 		searches for prime numbers in the configurable range, doing that configurable
@@ -57,7 +56,6 @@ config EXAMPLES_OSTEST_RR_RUNS
 	int "Round-robin test - number of runs"
 	default 10
 	range 1 32767
-	depends on RR_INTERVAL > 0
 	---help---
 		During round-robin scheduling test two threads are created. Each of the threads
 		searches for prime numbers in the configurable range, doing that configurable

apps/include/netutils/webclient.h

@@ -109,12 +109,14 @@ extern "C" {
 #define EXTERN extern
 #endif
 
+#ifdef WGET_USE_URLENCODE
 EXTERN char *web_post_str(FAR char *buffer, int *size, FAR char *name,
                           FAR char *value);
 EXTERN char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
                            FAR char **value, int len);
 EXTERN int web_post_strlen(FAR char *name, FAR char *value);
 EXTERN int web_posts_strlen(FAR char **name, FAR char **value, int len);
+#endif
 
 /****************************************************************************
  * Name: wget

apps/netutils/webclient/webclient.c

@@ -77,12 +77,15 @@
 
 #if defined(CONFIG_NETUTILS_CODECS)
 #  if defined(CONFIG_CODECS_URLCODE)
-#    define     WGET_USE_URLENCODE      1
+#    define WGET_USE_URLENCODE 1
 #    include <apps/netutils/urldecode.h>
 #  endif
 #  if defined(CONFIG_CODECS_BASE64)
 #    include <apps/netutils/base64.h>
 #  endif
+#else
+#  undef CONFIG_CODECS_URLCODE
+#  undef CONFIG_CODECS_BASE64
 #endif
 
 #ifndef CONFIG_NSH_WGET_USERAGENT
@@ -206,7 +209,7 @@ static char *wget_strcpy(char *dest, const char *src)
  * Name: wget_urlencode_strcpy
  ****************************************************************************/
 
-#ifdef  WGET_USE_URLENCODE
+#ifdef WGET_USE_URLENCODE
 static char *wget_urlencode_strcpy(char *dest, const char *src)
 {
   int len = strlen(src);
@@ -621,6 +624,7 @@ errout:
  * Name: web_post_str
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 char *web_post_str(FAR char *buffer, int *size, FAR char *name,
                    FAR char *value)
 {
@@ -631,20 +635,24 @@ char *web_post_str(FAR char *buffer, int *size, FAR char *name,
   *size  = buffer - dst;
   return dst;
 }
+#endif
 
 /****************************************************************************
  * Name: web_post_strlen
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 int web_post_strlen(FAR char *name, FAR char *value)
 {
   return strlen(name) + urlencode_len(value,strlen(value)) + 1;
 }
+#endif
 
 /****************************************************************************
  * Name: web_posts_str
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
                     FAR char **value, int len)
 {
@@ -667,11 +675,13 @@ char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
   *size=buffer-dst;
   return dst;
 }
+#endif
 
 /****************************************************************************
  * Name: web_posts_strlen
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 int web_posts_strlen(FAR char **name, FAR char **value, int len)
 {
   int wlen = 0;
@@ -684,6 +694,7 @@ int web_posts_strlen(FAR char **name, FAR char **value, int len)
 
   return wlen + len - 1;
 }
+#endif
 
 /****************************************************************************
  * Name: wget
@@ -720,7 +731,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
 }
 
 /****************************************************************************
- * Name: web_posts_strlen
+ * Name: wget_post
  ****************************************************************************/
 
 int wget_post(FAR const char *url, FAR const char *posts, FAR char *buffer,

nuttx/configs/Kconfig

@@ -860,7 +860,7 @@ if ARCH_BOARD_STM3240G_EVAL
 source "configs/stm3240g-eval/Kconfig"
 endif
 if ARCH_BOARD_STM32F100RC_GENERIC
-source "configs/stm32f100_generic/Kconfig"
+source "configs/stm32f100rc_generic/Kconfig"
 endif
 if ARCH_BOARD_STM32F4_DISCOVERY
 source "configs/stm32f4discovery/Kconfig"

nuttx/configs/shenzhou/nsh/defconfig

@@ -28,6 +28,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
 
 #
@@ -51,6 +52,10 @@ CONFIG_ARCH_ARM=y
 # CONFIG_ARCH_Z16 is not set
 # CONFIG_ARCH_Z80 is not set
 CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
@@ -68,6 +73,8 @@ CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="stm32"
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 CONFIG_ARCH_IRQPRIO=y
@@ -83,8 +90,14 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 # CONFIG_ARCH_CHIP_STM32F100CB is not set
 # CONFIG_ARCH_CHIP_STM32F100R8 is not set
 # CONFIG_ARCH_CHIP_STM32F100RB is not set
+# CONFIG_ARCH_CHIP_STM32F100RC is not set
+# CONFIG_ARCH_CHIP_STM32F100RD is not set
+# CONFIG_ARCH_CHIP_STM32F100RE is not set
 # CONFIG_ARCH_CHIP_STM32F100V8 is not set
 # CONFIG_ARCH_CHIP_STM32F100VB is not set
+# CONFIG_ARCH_CHIP_STM32F100VC is not set
+# CONFIG_ARCH_CHIP_STM32F100VD is not set
+# CONFIG_ARCH_CHIP_STM32F100VE is not set
 # CONFIG_ARCH_CHIP_STM32F103RET6 is not set
 # CONFIG_ARCH_CHIP_STM32F103VCT6 is not set
 # CONFIG_ARCH_CHIP_STM32F103VET6 is not set
@@ -118,11 +131,11 @@ CONFIG_STM32_CODESOURCERYW=y
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
+CONFIG_STM32_BKP=y
+# CONFIG_STM32_CAN1 is not set
 # CONFIG_STM32_CRC is not set
 # CONFIG_STM32_DMA1 is not set
 # CONFIG_STM32_DMA2 is not set
-CONFIG_STM32_BKP=y
-# CONFIG_STM32_CAN1 is not set
 # CONFIG_STM32_DAC1 is not set
 # CONFIG_STM32_DAC2 is not set
 CONFIG_STM32_ETHMAC=y
@@ -153,9 +166,9 @@ CONFIG_STM32_SPI=y
 #
 # Alternate Pin Mapping
 #
-CONFIG_STM32_USART2_REMAP=y
-# CONFIG_STM32_SPI1_REMAP is not set
 CONFIG_STM32_ETH_REMAP=y
+# CONFIG_STM32_SPI1_REMAP is not set
+CONFIG_STM32_USART2_REMAP=y
 # CONFIG_STM32_JTAG_DISABLE is not set
 CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
@@ -445,6 +458,14 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
 
+#
+# Binary Formats
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
 #
 # Library Routines
 #
@@ -452,6 +473,7 @@ CONFIG_STDIO_BUFFER_SIZE=256
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 # CONFIG_EOL_IS_CR is not set
@@ -464,10 +486,19 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+
+#
+# Basic CXX Support
+#
 CONFIG_HAVE_CXX=y
 # CONFIG_HAVE_CXXINITIALIZE is not set
 # CONFIG_CXX_NEWLONG is not set
 
+#
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
 #
 # Application Configuration
 #
@@ -480,260 +511,57 @@ CONFIG_NAMEDAPP=y
 #
 # Examples
 #
-
-#
-# ADC Example
-#
-# CONFIG_EXAMPLES_ADC is not set
-
-#
-# Buttons Example
-#
 # CONFIG_EXAMPLES_BUTTONS is not set
-
-#
-# CAN Example
-#
 # CONFIG_EXAMPLES_CAN is not set
-
-#
-# USB CDC/ACM Class Driver Example
-#
 # CONFIG_EXAMPLES_CDCACM is not set
-
-#
-# USB composite Class Driver Example
-#
 # CONFIG_EXAMPLES_COMPOSITE is not set
-
+# CONFIG_EXAMPLES_CXXTEST is not set
-#
-# DHCP Server Example
-#
 # CONFIG_EXAMPLES_DHCPD is not set
-
+# CONFIG_EXAMPLES_ELF is not set
-#
-# FTP Client Example
-#
 # CONFIG_EXAMPLES_FTPC is not set
-
-#
-# FTP Server Example
-#
 # CONFIG_EXAMPLES_FTPD is not set
-
-#
-# "Hello, World!" Example
-#
 # CONFIG_EXAMPLES_HELLO is not set
-
-#
-# "Hello, World!" C++ Example
-#
 # CONFIG_EXAMPLES_HELLOXX is not set
-
+# CONFIG_EXAMPLES_JSON is not set
-#
-# USB HID Keyboard Example
-#
 # CONFIG_EXAMPLES_HIDKBD is not set
-
-#
-# IGMP Example
-#
 # CONFIG_EXAMPLES_IGMP is not set
-
-#
-# LCD Read/Write Example
-#
 # CONFIG_EXAMPLES_LCDRW is not set
-
-#
-# Memory Management Example
-#
 # CONFIG_EXAMPLES_MM is not set
-
-#
-# File System Mount Example
-#
 # CONFIG_EXAMPLES_MOUNT is not set
-
-#
-# FreeModBus Example
-#
 # CONFIG_EXAMPLES_MODBUS is not set
-
-#
-# Network Test Example
-#
 # CONFIG_EXAMPLES_NETTEST is not set
-
-#
-# NuttShell (NSH) Example
-#
 CONFIG_EXAMPLES_NSH=y
-
-#
-# NULL Example
-#
 # CONFIG_EXAMPLES_NULL is not set
-
-#
-# NX Graphics Example
-#
 # CONFIG_EXAMPLES_NX is not set
-
-#
-# NxConsole Example
-#
 # CONFIG_EXAMPLES_NXCONSOLE is not set
-
-#
-# NXFFS File System Example
-#
 # CONFIG_EXAMPLES_NXFFS is not set
-
-#
-# NXFLAT Example
-#
 # CONFIG_EXAMPLES_NXFLAT is not set
-
-#
-# NX Graphics "Hello, World!" Example
-#
 # CONFIG_EXAMPLES_NXHELLO is not set
-
-#
-# NX Graphics image Example
-#
 # CONFIG_EXAMPLES_NXIMAGE is not set
-
-#
-# NX Graphics lines Example
-#
 # CONFIG_EXAMPLES_NXLINES is not set
-
-#
-# NX Graphics Text Example
-#
 # CONFIG_EXAMPLES_NXTEXT is not set
-
-#
-# OS Test Example
-#
 # CONFIG_EXAMPLES_OSTEST is not set
-
-#
-# Pascal "Hello, World!"example
-#
 # CONFIG_EXAMPLES_PASHELLO is not set
-
-#
-# Pipe Example
-#
 # CONFIG_EXAMPLES_PIPE is not set
-
-#
-# Poll Example
-#
 # CONFIG_EXAMPLES_POLL is not set
-
-#
-# Pulse Width Modulation (PWM) Example
-#
-
-#
-# Quadrature Encoder Example
-#
 # CONFIG_EXAMPLES_QENCODER is not set
-
-#
-# RGMP Example
-#
 # CONFIG_EXAMPLES_RGMP is not set
-
-#
-# ROMFS Example
-#
 # CONFIG_EXAMPLES_ROMFS is not set
-
-#
-# sendmail Example
-#
 # CONFIG_EXAMPLES_SENDMAIL is not set
-
-#
-# Serial Loopback Example
-#
 # CONFIG_EXAMPLES_SERLOOP is not set
-
-#
-# Telnet Daemon Example
-#
 # CONFIG_EXAMPLES_TELNETD is not set
-
-#
-# THTTPD Web Server Example
-#
 # CONFIG_EXAMPLES_THTTPD is not set
-
-#
-# TIFF Generation Example
-#
 # CONFIG_EXAMPLES_TIFF is not set
-
-#
-# Touchscreen Example
-#
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-
-#
-# UDP Example
-#
 # CONFIG_EXAMPLES_UDP is not set
-
-#
-# UDP Discovery Daemon Example
-#
 # CONFIG_EXAMPLES_DISCOVER is not set
-
-#
-# uIP Web Server Example
-#
 # CONFIG_EXAMPLES_UIP is not set
-
-#
-# USB Serial Test Example
-#
 # CONFIG_EXAMPLES_USBSERIAL is not set
-
-#
-# USB Mass Storage Class Example
-#
 # CONFIG_EXAMPLES_USBMSC is not set
-
-#
-# USB Serial Terminal Example
-#
 # CONFIG_EXAMPLES_USBTERM is not set
-
-#
-# Watchdog timer Example
-#
 # CONFIG_EXAMPLES_WATCHDOG is not set
-
-#
-# wget Example
-#
-# CONFIG_EXAMPLES_WGET is not set
-
-#
-# WLAN Example
-#
 # CONFIG_EXAMPLES_WLAN is not set
 
-#
-# XML RPC Example
-#
-
 #
 # Interpreters
 #
@@ -751,76 +579,24 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Networking Utilities
 #
-
+# CONFIG_NETUTILS_CODECS is not set
-#
-# DHCP client
-#
 # CONFIG_NETUTILS_DHCPC is not set
-
-#
-# DHCP server
-#
 # CONFIG_NETUTILS_DHCPD is not set
-
-#
-# FTP client
-#
 # CONFIG_NETUTILS_FTPC is not set
-
-#
-# FTP server
-#
 # CONFIG_NETUTILS_FTPD is not set
-
+# CONFIG_NETUTILS_JSON is not set
-#
-# Name resolution
-#
 CONFIG_NETUTILS_RESOLV=y
 CONFIG_NET_RESOLV_ENTRIES=8
-
+CONFIG_NET_RESOLV_MAXRESPONSE=96
-#
-# SMTP
-#
 # CONFIG_NETUTILS_SMTP is not set
-
-#
-# TFTP client
-#
 CONFIG_NETUTILS_TELNETD=y
-
-#
-# TFTP client
-#
 CONFIG_NETUTILS_TFTPC=y
-
-#
-# THTTPD web server
-#
 # CONFIG_NETUTILS_THTTPD is not set
-
-#
-# uIP support library
-#
 CONFIG_NETUTILS_UIPLIB=y
-
-#
-# uIP web client
-#
 CONFIG_NETUTILS_WEBCLIENT=y
-
+CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
-#
-# uIP web server
-#
 # CONFIG_NETUTILS_WEBSERVER is not set
-
-#
-# UDP Discovery Utility
-#
 # CONFIG_NETUTILS_DISCOVER is not set
-
-#
-# XML-RPC library
-#
 # CONFIG_NETUTILS_XMLRPC is not set
 
 #
@@ -879,6 +655,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_NESTDEPTH=3
@@ -894,10 +671,12 @@ CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
 CONFIG_NSH_TELNETD_CLIENTPRIO=100
 CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
 CONFIG_NSH_IOBUFFER_SIZE=512
+# CONFIG_NSH_TELNET_LOGIN is not set
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_NOMAC=y
+CONFIG_NSH_MAX_ROUNDTRIP=20
 
 #
 # NxWidgets/NxWM

nuttx/drivers/mmcsd/Make.defs

@@ -33,15 +33,15 @@
 #
 ############################################################################
 
-if ($(CONFIG_MMCSD),y)
+ifeq ($(CONFIG_MMCSD),y)
 
 # Include MMC/SD drivers
 
-if ($(CONFIG_MMCSD_SDIO),y)
+ifeq ($(CONFIG_MMCSD_SDIO),y)
 CSRCS += mmcsd_sdio.c
 endif
 
-if ($(CONFIG_MMCSD_SPI),y)
+ifeq ($(CONFIG_MMCSD_SPI),y)
 CSRCS += mmcsd_spi.c mmcsd_debug.c
 endif