deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

More uip_ipaddr_t fixes and removal of the last occurances of WITH_UIP.

Browse source
This commit is contained in:
oliverschmidt 2006-08-21 21:42:40 +00:00
parent 7d0371fa0a
commit 105e4a8aa3
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/netconf/netconf.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: netconf.c,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $ * $Id: netconf.c,v 1.2 2006/08/21 21:42:40 oliverschmidt Exp $
* *
*/ */
@ -114,8 +114,7 @@ makestrings(void)
{ {
u16_t addr[2], *addrptr; u16_t addr[2], *addrptr;
#ifdef WITH_UIP uip_gethostaddr(&addr);
uip_gethostaddr(addr);
makeaddr(addr, ipaddr); makeaddr(addr, ipaddr);
#ifdef WITH_ETHERNET #ifdef WITH_ETHERNET
@ -130,9 +129,6 @@ makestrings(void)
if(addrptr != NULL) { if(addrptr != NULL) {
makeaddr(addrptr, dnsserver); makeaddr(addrptr, dnsserver);
} }
#endif /* WITH_UIP */
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void
@ -149,7 +145,6 @@ apply_tcpipconfig(void)
{ {
u16_t addr[2]; u16_t addr[2];
#ifdef WITH_UIP
nullterminate(ipaddr); nullterminate(ipaddr);
if(uiplib_ipaddrconv(ipaddr, (unsigned char *)addr)) { if(uiplib_ipaddrconv(ipaddr, (unsigned char *)addr)) {
uip_sethostaddr(addr); uip_sethostaddr(addr);
@ -171,7 +166,6 @@ apply_tcpipconfig(void)
if(uiplib_ipaddrconv(dnsserver, (unsigned char *)addr)) { if(uiplib_ipaddrconv(dnsserver, (unsigned char *)addr)) {
resolv_conf(addr); resolv_conf(addr);
} }
#endif /* WITH_UIP */
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void