diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-12 20:14:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-12 20:14:46 +0000 |
| commit | 6649286b2f4917b87ecdd790eba138aefcf2b210 (patch) | |
| tree | 92a86ff9d6ca32ab4ebc6c485a3bfd2fdc594925 /apps/examples/discover | |
| parent | d660afc8fd83a630d0a223dd2796003024ce4f11 (diff) | |
| download | nuttx-6649286b2f4917b87ecdd790eba138aefcf2b210.tar.gz nuttx-6649286b2f4917b87ecdd790eba138aefcf2b210.tar.bz2 nuttx-6649286b2f4917b87ecdd790eba138aefcf2b210.zip | |
Add UDP discovery configuration for the STM3240G-EVAL (from Max Holtzberg)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5138 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/discover')
| -rw-r--r-- | apps/examples/discover/Kconfig | 7 | ||||
| -rw-r--r-- | apps/examples/discover/main.c | 44 |
2 files changed, 26 insertions, 25 deletions
diff --git a/apps/examples/discover/Kconfig b/apps/examples/discover/Kconfig index afdb9ff82..c867b56f3 100644 --- a/apps/examples/discover/Kconfig +++ b/apps/examples/discover/Kconfig @@ -3,7 +3,7 @@ # see misc/tools/kconfig-language.txt. # -config EXAMPLES_DISCOVER +config EXAMPLE_DISCOVER bool "UDP Discovery Example" default n depends on NET_UDP @@ -17,11 +17,13 @@ config EXAMPLES_DISCOVER It is also possible to address all classes with a kind of broadcast discover. -if EXAMPLES_DISCOVER +if EXAMPLE_DISCOVER config EXAMPLE_DISCOVER_DHCPC bool "DHCP Client" default n + select NETUTILS_DHCPC + select NETUTILS_RESOLV config EXAMPLE_DISCOVER_NOMAC bool "Use canned MAC address" @@ -30,6 +32,7 @@ config EXAMPLE_DISCOVER_NOMAC config EXAMPLE_DISCOVER_IPADDR hex "Target IP address" default 0x0a000002 + depends on !EXAMPLE_DISCOVER_DHCPC config EXAMPLE_DISCOVER_DRIPADDR hex "Router IP address" diff --git a/apps/examples/discover/main.c b/apps/examples/discover/main.c index b857e4f68..619995186 100644 --- a/apps/examples/discover/main.c +++ b/apps/examples/discover/main.c @@ -87,7 +87,6 @@ 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) uint8_t mac[IFHWADDRLEN]; @@ -147,30 +146,29 @@ int discover_main(int argc, char *argv[]) printf("Getting IP address\n"); if (handle) { - struct dhcpc_state ds; - (void)dhcpc_request(handle, &ds); - uip_sethostaddr("eth1", &ds.ipaddr); - - if (ds.netmask.s_addr != 0) - { - uip_setnetmask("eth0", &ds.netmask); - } - - if (ds.default_router.s_addr != 0) - { - uip_setdraddr("eth0", &ds.default_router); - } - - if (ds.dnsaddr.s_addr != 0) - { - resolv_conf(&ds.dnsaddr); - } - - dhcpc_close(handle); - printf("IP: %s\n", inet_ntoa(ds.ipaddr)); + struct dhcpc_state ds; + (void)dhcpc_request(handle, &ds); + uip_sethostaddr("eth1", &ds.ipaddr); + + if (ds.netmask.s_addr != 0) + { + uip_setnetmask("eth0", &ds.netmask); + } + + if (ds.default_router.s_addr != 0) + { + uip_setdraddr("eth0", &ds.default_router); + } + + if (ds.dnsaddr.s_addr != 0) + { + resolv_conf(&ds.dnsaddr); + } + + dhcpc_close(handle); + printf("IP: %s\n", inet_ntoa(ds.ipaddr)); } #endif -#endif /* CONFIG_NSH_BUILTIN_APPS */ if (discover_start() < 0) { |