Change all occurrences of CONFIG_EXAMPLE_ to CONFIG_EXAMPLES_ for consistency; fleshed out a few more Kconfig files

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

2 files changed, 22 insertions, 22 deletions

diff --git a/apps/examples/discover/Kconfig b/apps/examples/discover/Kconfig
index 0a756d91d..1cbb7f120 100644
--- a/apps/examples/discover/Kconfig
+++ b/apps/examples/discover/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config EXAMPLE_DISCOVER
+config EXAMPLES_DISCOVER
 	bool "UDP Discovery Example"
 	default n
 	depends on NET_UDP
@@ -17,29 +17,29 @@ config EXAMPLE_DISCOVER
 		It is also possible to address all classes with a kind of broadcast
 		discover.
 
-config EXAMPLE_DISCOVER_DHCPC
+config EXAMPLES_DISCOVER_DHCPC
 	bool "DHCP Client"
 	default n
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 	select NETUTILS_DHCPC
 	select NETUTILS_RESOLV
 
-config EXAMPLE_DISCOVER_NOMAC
+config EXAMPLES_DISCOVER_NOMAC
 	bool "Use Canned MAC Address"
 	default n
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 
-config EXAMPLE_DISCOVER_IPADDR
+config EXAMPLES_DISCOVER_IPADDR
 	hex "Target IP address"
 	default 0x0a000002
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS && !EXAMPLE_DISCOVER_DHCPC
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS && !EXAMPLES_DISCOVER_DHCPC
 
-config EXAMPLE_DISCOVER_DRIPADDR
+config EXAMPLES_DISCOVER_DRIPADDR
 	hex "Default Router IP address (Gateway)"
 	default 0x0a000001
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 
-config EXAMPLE_DISCOVER_NETMASK
+config EXAMPLES_DISCOVER_NETMASK
 	hex "Network Mask"
 	default 0xffffff00
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c
index c3acb56df..259a93d98 100644
--- a/apps/examples/discover/discover_main.c
+++ b/apps/examples/discover/discover_main.c
@@ -54,7 +54,7 @@
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/discover.h>
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
 #  include <arpa/inet.h>
 #endif
 
@@ -64,7 +64,7 @@
 
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
 #  include <apps/netutils/resolv.h>
 #  include <apps/netutils/dhcpc.h>
 #endif
@@ -93,16 +93,16 @@ int discover_main(int argc, char *argv[])
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLE_DISCOVER_NOMAC)
+#if defined(CONFIG_EXAMPLES_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLES_DISCOVER_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   void *handle;
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_NOMAC
+#ifdef CONFIG_EXAMPLES_DISCOVER_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -114,24 +114,24 @@ int discover_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   addr.s_addr = 0;
 #else
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_IPADDR);
 #endif
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_NETMASK);
   uip_setnetmask("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   /* Set up the resolver */
 
   resolv_init();
@@ -174,7 +174,7 @@ int discover_main(int argc, char *argv[])
       printf("IP: %s\n", inet_ntoa(ds.ipaddr));
     }
 
-#endif /* CONFIG_EXAMPLE_DISCOVER_DHCPC */
+#endif /* CONFIG_EXAMPLES_DISCOVER_DHCPC */
 #endif /* CONFIG_NSH_BUILTIN_APPS */
 
   if (discover_start() < 0)