diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
| commit | dacf833f9af5137dcad044152b8c75e56ddd0e79 (patch) | |
| tree | 77d8c645bbcbc5843d09373dd67bf01207b5739e /apps/nshlib/nsh_netinit.c | |
| parent | 058e81edfdee203f2143b3f0910aa957a7f8da48 (diff) | |
| download | px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.gz px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.bz2 px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.zip | |
Update documentation, change CONFIG_EXAMPLES_NSH to CONFIG_NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3394 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib/nsh_netinit.c')
| -rw-r--r-- | apps/nshlib/nsh_netinit.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index eb0052cc7..f49c64e40 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -46,7 +46,7 @@ #include <net/if.h> #include <net/uip/uip-lib.h> -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) # include <net/uip/resolv.h> # include <net/uip/dhcpc.h> #endif @@ -86,16 +86,16 @@ int nsh_netinit(void) { struct in_addr addr; -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) FAR void *handle; #endif -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) || defined(CONFIG_EXAMPLES_NSH_NOMAC) +#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_NOMAC) uint8_t mac[IFHWADDRLEN]; #endif /* Many embedded network interfaces must have a software assigned MAC */ -#ifdef CONFIG_EXAMPLES_NSH_NOMAC +#ifdef CONFIG_NSH_NOMAC mac[0] = 0x00; mac[1] = 0xe0; mac[2] = 0xb0; @@ -107,8 +107,8 @@ int nsh_netinit(void) /* Set up our host address */ -#if !defined(CONFIG_EXAMPLES_NSH_DHCPC) - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_IPADDR); +#if !defined(CONFIG_NSH_DHCPC) + addr.s_addr = HTONL(CONFIG_NSH_IPADDR); #else addr.s_addr = 0; #endif @@ -116,21 +116,21 @@ int nsh_netinit(void) /* Set up the default router address */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_DRIPADDR); + addr.s_addr = HTONL(CONFIG_NSH_DRIPADDR); uip_setdraddr("eth0", &addr); /* Setup the subnet mask */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_NETMASK); + addr.s_addr = HTONL(CONFIG_NSH_NETMASK); uip_setnetmask("eth0", &addr); -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) /* Set up the resolver */ resolv_init(); #endif -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) /* Get the MAC address of the NIC */ uip_getmacaddr("eth0", mac); |