sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppress network configuration in discover example if it is an NSH built-in functin

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5139 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-12 21:42:36 +00:00
parent 7b801057ca
commit 2325332e51
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/discover/Kconfig
View File

@ -17,29 +17,29 @@ config EXAMPLE_DISCOVER
It is also possible to address all classes with a kind of broadcast It is also possible to address all classes with a kind of broadcast
discover. discover.
if EXAMPLE_DISCOVER
config EXAMPLE_DISCOVER_DHCPC config EXAMPLE_DISCOVER_DHCPC
bool "DHCP Client" bool "DHCP Client"
default n default n
depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
select NETUTILS_DHCPC select NETUTILS_DHCPC
select NETUTILS_RESOLV select NETUTILS_RESOLV
config EXAMPLE_DISCOVER_NOMAC config EXAMPLE_DISCOVER_NOMAC
bool "Use canned MAC address" bool "Use Canned MAC Address"
default n default n
depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
config EXAMPLE_DISCOVER_IPADDR config EXAMPLE_DISCOVER_IPADDR
hex "Target IP address" hex "Target IP address"
default 0x0a000002 default 0x0a000002
depends on !EXAMPLE_DISCOVER_DHCPC depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS && !EXAMPLE_DISCOVER_DHCPC
config EXAMPLE_DISCOVER_DRIPADDR config EXAMPLE_DISCOVER_DRIPADDR
hex "Router IP address" hex "Default Router IP address (Gateway)"
default 0x0a000001 default 0x0a000001
depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
config EXAMPLE_DISCOVER_NETMASK config EXAMPLE_DISCOVER_NETMASK
hex "Network Mask" hex "Network Mask"
default 0xffffff00 default 0xffffff00
depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
endif

9
examples/discover/main.c
View File

@ -87,6 +87,11 @@
int discover_main(int argc, char *argv[]) int discover_main(int argc, char *argv[])
{ {
/* If this task is excecutated as an NSH built-in function, then the
* network has already been configured by NSH's start-up logic.
*/
#ifndef CONFIG_NSH_BUILTIN_APPS
struct in_addr addr; struct in_addr addr;
#if defined(CONFIG_EXAMPLE_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLE_DISCOVER_NOMAC) #if defined(CONFIG_EXAMPLE_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLE_DISCOVER_NOMAC)
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
@ -168,7 +173,9 @@ int discover_main(int argc, char *argv[])
dhcpc_close(handle); dhcpc_close(handle);
printf("IP: %s\n", inet_ntoa(ds.ipaddr)); printf("IP: %s\n", inet_ntoa(ds.ipaddr));
} }
#endif
#endif /* CONFIG_EXAMPLE_DISCOVER_DHCPC */
#endif /* CONFIG_NSH_BUILTIN_APPS */
if (discover_start() < 0) if (discover_start() < 0)
{ {