Kconfig update

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

7 files changed, 300 insertions, 9 deletions

diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig
index ae2bf3130..6570af783 100644
--- a/apps/netutils/Kconfig
+++ b/apps/netutils/Kconfig
@@ -2,3 +2,51 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+menu "DHCP client"
+source "$APPSDIR/netutils/dhcpc/Kconfig"
+endmenu
+
+menu "DHCP server"
+source "$APPSDIR/netutils/dhcpd/Kconfig"
+endmenu
+
+menu "FTP client"
+source "$APPSDIR/netutils/ftpc/Kconfig"
+endmenu
+
+menu "FTP server"
+source "$APPSDIR/netutils/ftpd/Kconfig"
+endmenu
+
+menu "Name resolution"
+source "$APPSDIR/netutils/resolv/Kconfig"
+endmenu
+
+menu "SMTP"
+source "$APPSDIR/netutils/smtp/Kconfig"
+endmenu
+
+menu "TFTP client"
+source "$APPSDIR/netutils/telnetd/Kconfig"
+endmenu
+
+menu "TFTP client"
+source "$APPSDIR/netutils/tftpc/Kconfig"
+endmenu
+
+menu "THTTPD web server"
+source "$APPSDIR/netutils/thttpd/Kconfig"
+endmenu
+
+menu "uIP support library"
+source "$APPSDIR/netutils/uiplib/Kconfig"
+endmenu
+
+menu "uIP web client"
+source "$APPSDIR/netutils/webclient/Kconfig"
+endmenu
+
+menu "uIP web server"
+source "$APPSDIR/netutils/webserver/Kconfig"
+endmenu
diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig
index ae2bf3130..7e003f10b 100644
--- a/apps/netutils/resolv/Kconfig
+++ b/apps/netutils/resolv/Kconfig
@@ -2,3 +2,9 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NET_RESOLV_ENTRIES
+	int "Number of resolver entries"
+	default 8
+	---help---
+		Number of resolver entries.  Default: 8
diff --git a/apps/netutils/telnetd/Kconfig b/apps/netutils/telnetd/Kconfig
new file mode 100644
index 000000000..ae2bf3130
--- /dev/null
+++ b/apps/netutils/telnetd/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
diff --git a/apps/netutils/tftpc/Kconfig b/apps/netutils/tftpc/Kconfig
new file mode 100644
index 000000000..ae2bf3130
--- /dev/null
+++ b/apps/netutils/tftpc/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
diff --git a/apps/netutils/thttpd/Kconfig b/apps/netutils/thttpd/Kconfig
index ae2bf3130..ee630ee3b 100644
--- a/apps/netutils/thttpd/Kconfig
+++ b/apps/netutils/thttpd/Kconfig
@@ -2,3 +2,232 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config THTTPD_PORT
+	int "THTTPD port number"
+	default 80
+	---help---
+		THTTPD Server port number.  Default: 80
+
+config THTTPD_IPADDR
+	hex "THTTPD IP address"
+	default 0x10000002
+	---help---
+		Server IP address (no host name).  Default: 0x10000002
+
+		This is a 32-bit integer value in host order.  So, as an example,
+		the default value of 0x10000002 would correspond to 10.0.0.2.
+
+config THTTPD_SERVER_ADDRESS
+	string "Reported server URL"
+	default "http://www.nuttx.org"
+	---help---
+		SERVER_ADDRESS: response, Default: "http://www.nuttx.org"
+
+config THTTPD_SERVER_SOFTWARE
+	string "Reporter server software string"
+	default "thttpd/2.25b 29dec2003-NuttX"
+	---help---
+		SERVER_SOFTWARE: response, Default: "thttpd/2.25b 29dec2003-NuttX"
+
+config THTTPD_PATH
+	string "Path to the server content"
+	default "/mnt/www"
+	---help---
+		Server working directory.  Default: "/mnt/www"
+
+config THTTPD_CGI_PATH
+	string "Path to CGI content"
+	default "/mnt/www/cgi-bin"
+	---help---
+		Path to CGI executables.  Default: "/mnt/www/cgi-bin"
+
+config THTTPD_CGI_PATTERN
+	string "CGI match pattern"
+	default "/mnt/www/cgi-bin/*"
+	---help---
+		Only CGI programs matching this pattern will be executed.  In
+		fact, if this value is not defined then no CGI logic will be built.
+		Default: "/mnt/www/cgi-bin/*"
+
+config THTTPD_CGI_PRIORITY
+	int "CGI child priority"
+	default 50
+	---help---
+		Provides the priority of CGI child tasks.  Default: 50
+
+config THTTPD_CGI_STACKSIZE
+	int "CGI child stack size"
+	default 2048
+	---help---
+		Provides the default stack size of CGI child task (will be overridden
+		by the stack size in the NXFLAT header)
+
+config THTTPD_CGI_BYTECOUNT
+	int "Byte output limit"
+	default 200000
+	---help---
+		Byte output limit for CGI tasks.  Default: 200000
+
+config THTTPD_CGI_TIMELIMIT
+	int "CGI time limit"
+	default 0
+	---help---
+		How many seconds to allow CGI programs to run before killing them.
+		Default: 0 (no time limit)
+
+config THTTPD_CHARSET
+	string "Default character set"
+	default "iso-8859-1"
+	---help---
+		The default character set name to use with text MIME types.
+		Default: "iso-8859-1"
+
+config THTTPD_IOBUFFERSIZE
+	int "Initial I/O buffer size"
+	default 256
+	---help---
+		Initial I/O buffer size.  Default: 256
+
+config THTTPD_MINSTRSIZE
+	int "Minimum string size"
+	default 64
+	---help---
+		Minimum string size.  Default: 64
+
+config THTTPD_REALLOCINCR
+	int "String reallocation increment"
+	default 64
+	---help---
+		String reallocation increment.  Default: 64
+
+config THTTPD_MAXREALLOC
+	int "Maximum string reallocation size"
+	default 4096
+	---help---
+		Maximum string reallocation size.  Default: 4096
+
+config THTTPD_CGIINBUFFERSIZ
+	int "CGI interpose input buffer size"
+	default 512
+	---help---
+		CGI interpose input buffer size.  Default: 512
+
+config THTTPD_CGIOUTBUFFERSIZE
+	int "CGI interpose output buffer size"
+	default 512
+	---help---
+		CGI interpose output buffer size.  Default: 512
+
+config THTTPD_INDEX_NAMES
+	string "Index file name list"
+	default "\"index.html\", \"index.htm\", \"index.cgi\""
+	---help---
+		A list of index filenames to check. The files are searched for
+		in this order.  Default: "\"index.html\", \"index.htm\", \"index.cgi\""
+
+config AUTH_FILE
+	string "Authorization file"
+#	default ".htpasswd"
+	---help---
+		The file to use for authentication. If this is defined then thttpd
+		checks for this file in the local directory before every fetch. If
+		the file exists then authentication is done, otherwise the fetch proceeds
+		as usual. If you leave this undefined then thttpd will not implement
+		authentication at all and will not check for auth files, which saves a
+		bit of CPU time. A typical value is ".htpasswd"
+
+config THTTPD_LISTEN_BACKLOG
+	int "Listen backlog"
+	default 8
+	---help---
+		The listen() backlog queue length.  Default: 8
+
+config THTTPD_LINGER_MSEC
+	int "Linger time (msec)"
+	default 500
+	---help---
+		How many milliseconds to leave a connection open while doing a lingering
+		close.  Default: 500
+
+config THTTPD_OCCASIONAL_MSEC
+	int "Occasional clean-up time (msec)"
+	default 120
+	---help---
+		How often to run the occasional cleanup job in milliseconds.
+		Default: 120 (2 minutes)
+
+config THTTPD_MEMDEBUG
+	bool "Enable memory debug"
+	default n
+	depends on DEBUG && DEBUG_NET
+	---help---
+		Enable THTTPD memory usage debug output.  Default: n
+
+config THTTPD_IDLE_READ_LIMIT_SEC
+	int "Idle read time limit (sec)"
+	default 300
+	---help---
+		How many seconds to allow for reading the initial request on a new connection.
+		Default: 300
+
+config THTTPD_IDLE_SEND_LIMIT_SEC
+	int "Idle send time limit (sec)"
+	default 300
+	---help---
+		How many seconds before an idle connection gets closed.
+		Default: 300
+
+config THTTPD_TILDE_MAP1
+	string "Tilde mapping"
+	---help---
+		Tilde mapping.
+
+		Many URLs use ~username to indicate a user's home directory. thttpd
+		provides two options for mapping this construct to an  actual filename.
+
+		1) Map ~username to <prefix>/username. This is the recommended choice.
+		 Each user gets a subdirectory in the main web tree, and the tilde
+		 construct points there. The prefix could be something like "users",
+		 or it could be empty.
+		2) Map ~username to <user's homedir>/<postfix>. The postfix would be
+		 the name of a subdirectory off of the user's actual home dir,
+		 something like "public_html".
+
+		You can also leave both options undefined, and thttpd will not do
+		anything special about tildes. Enabling both options is an error.
+		Typical values, if they're defined, are "users" for
+		config THTTPD_TILDE_MAP1 and "public_html" for THTTPD_TILDE_MAP2. 
+
+config THTTPD_TILDE_MAP2
+	string "Tilde mapping"
+	---help---
+		Tilde mapping.
+
+		Many URLs use ~username to indicate a user's home directory. thttpd
+		provides two options for mapping this construct to an  actual filename.
+
+		1) Map ~username to <prefix>/username. This is the recommended choice.
+		 Each user gets a subdirectory in the main web tree, and the tilde
+		 construct points there. The prefix could be something like "users",
+		 or it could be empty.
+		2) Map ~username to <user's homedir>/<postfix>. The postfix would be
+		 the name of a subdirectory off of the user's actual home dir,
+		 something like "public_html".
+
+		You can also leave both options undefined, and thttpd will not do
+		anything special about tildes. Enabling both options is an error.
+		Typical values, if they're defined, are "users" for
+		config THTTPD_TILDE_MAP1 and "public_html" for THTTPD_TILDE_MAP2. 
+
+config THTTPD_GENERATE_INDICES
+	bool "Generate name indices"
+	default n
+	---help---
+
+config THTTPD_URLPATTERN
+	string "URL pattern"
+	---help---
+		If defined, then it will be used to match and verify referrers.
+
+
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index 774a633e1..4a84148c9 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -126,10 +126,10 @@ config NSH_DISABLE_XD
 endmenu
 
 config NSH_FILEIOSIZE
-	bool "NSH I/O buffer size"
+	int "NSH I/O buffer size"
 	default 1024
 	---help---
-      Size of a static I/O buffer used for file access (ignored if
+		Size of a static I/O buffer used for file access (ignored if
 		there is no filesystem). Default is 1024.
 
 config NSH_STRERROR
@@ -366,7 +366,7 @@ config NSH_DHCPC
 
 if !NSH_DHCPC
 config NSH_IPADDR
-	int "Target IP address"
+	hex "Target IP address"
 	default 0x10000002
 	---help---
 		If NSH_DHCPC is NOT set, then the static IP address must be provided.
@@ -374,14 +374,14 @@ config NSH_IPADDR
 		0x10000002 would be 10.0.0.2.
 
 config NSH_DRIPADDR
-	int "Router IP address"
+	hex "Router IP address"
 	default 0x10000001
 	---help---
 		Default router IP address (aka, Gateway).  This is a 32-bit integer
 		value in host order.  So, as an example, 0x10000001 would be 10.0.0.1.
 
 config NSH_NETMASK
-	int "Network mask"
+	hex "Network mask"
 	default 0xffffff00
 	---help---
 		Network mask.  This is a 32-bit integer value in host order.  So, as
diff --git a/apps/system/i2c/Kconfig b/apps/system/i2c/Kconfig
index 8573720b8..6922464f8 100644
--- a/apps/system/i2c/Kconfig
+++ b/apps/system/i2c/Kconfig
@@ -5,7 +5,7 @@
 
 #if I2C
 config I2CTOOL_BUILTIN
-	int "NSH built-in command"
+	bool "NSH built-in command"
 	default y
 	depends on NSH_BUILTIN_APPS
 	---help---
@@ -24,19 +24,19 @@ config I2CTOOL_MAXBUS
 		Largest bus index supported by the hardware (default 3)
 
 config I2CTOOL_MINADDR
-	int "Minimum I2C address"
+	hex "Minimum I2C address"
 	default 0x03
 	---help---
 		Minium 7-bit device address (default: 0x03)
 
 config I2CTOOL_MAXADDR
-	int "Maximum I2C address"
+	hex "Maximum I2C address"
 	default 0x77
 	---help---
 		Largest 7-bit device address (default: 0x77)
 
 config I2CTOOL_MAXREGADDR
-	int "Maximum I2C register address"
+	hex "Maximum I2C register address"
 	default 0xff
 	---help---
 		Largest I2C register address (default: 0xff)