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

Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*

Browse source
This commit is contained in:
Simon Duquennoy 2014-12-01 21:02:57 +01:00
parent 229c53a2e6
commit a9cc909794
107 changed files with 617 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

24
platform/micaz/init-net.c
View file

@ -54,11 +54,11 @@
#include "dev/ds2401.h"
#include "sys/node-id.h"
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h"
@ -70,7 +70,7 @@ static struct uip_fw_netif meshif =
static uint8_t is_gateway;
#endif /* UIP_CONF_IPV4 */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
@ -82,7 +82,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, ds2401_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -103,7 +103,7 @@ set_rime_addr(void)
}
/*--------------------------------------------------------------------------*/
#if UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -118,7 +118,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* UIP_CONF_IPV4 */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
void
init_net(void)
@ -141,7 +141,7 @@ init_net(void)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, ds2401_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
@ -188,7 +188,7 @@ init_net(void)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -199,10 +199,10 @@ init_net(void)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV4
uip_ipaddr_t hostaddr, netmask;
uip_init();
@ -236,7 +236,7 @@ init_net(void)
uip_over_mesh_init(UIP_OVER_MESH_CHANNEL);
printf_P(PSTR("uIP started with IP address %d.%d.%d.%d\n"),
uip_ipaddr_to_quad(&hostaddr));
#endif /* UIP_CONF_IPV4 */
#endif /* NETSTACK_CONF_WITH_IPV4 */