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

Changed the name of the rimeaddr module to linkaddr

Browse source
This commit is contained in:
Adam Dunkels 2013-12-12 23:58:52 +01:00
parent 765e9acded
commit 45265249fc
180 changed files with 930 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

22
platform/iris/init-net.c
View file

@ -77,15 +77,15 @@ static uint8_t is_gateway;
static void
set_rime_addr(void)
{
rimeaddr_t addr;
linkaddr_t addr;
int i;
memset(&addr, 0, sizeof(rimeaddr_t));
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
memcpy(addr.u8, ds2401_id, sizeof(addr.u8));
#else
if(node_id == 0) {
for(i = 0; i < sizeof(rimeaddr_t); ++i) {
for(i = 0; i < sizeof(linkaddr_t); ++i) {
addr.u8[i] = ds2401_id[7 - i];
}
} else {
@ -93,7 +93,7 @@ set_rime_addr(void)
addr.u8[1] = node_id >> 8;
}
#endif
rimeaddr_set_node_addr(&addr);
linkaddr_set_node_addr(&addr);
printf_P(PSTR("Rime started with address "));
for(i = 0; i < sizeof(addr.u8) - 1; i++) {
printf_P(PSTR("%d."), addr.u8[i]);
@ -109,10 +109,10 @@ set_gateway(void)
if(!is_gateway) {
leds_on(LEDS_RED);
printf_P(PSTR("%d.%d: making myself the IP network gateway.\n\n"),
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1]);
printf_P(PSTR("IPv4 address of the gateway: %d.%d.%d.%d\n\n"),
uip_ipaddr_to_quad(&uip_hostaddr));
uip_over_mesh_set_gateway(&rimeaddr_node_addr);
uip_over_mesh_set_gateway(&linkaddr_node_addr);
uip_over_mesh_make_announced_gateway();
is_gateway = 1;
}
@ -129,10 +129,10 @@ init_net(void)
uint8_t longaddr[8];
uint16_t shortaddr;
shortaddr = (rimeaddr_node_addr.u8[0] << 8) +
rimeaddr_node_addr.u8[1];
shortaddr = (linkaddr_node_addr.u8[0] << 8) +
linkaddr_node_addr.u8[1];
memset(longaddr, 0, sizeof(longaddr));
rimeaddr_copy((rimeaddr_t *)&longaddr, &rimeaddr_node_addr);
linkaddr_copy((linkaddr_t *)&longaddr, &linkaddr_node_addr);
printf_P(PSTR("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n"),
longaddr[0], longaddr[1], longaddr[2], longaddr[3],
longaddr[4], longaddr[5], longaddr[6], longaddr[7]);
@ -216,8 +216,8 @@ init_net(void)
slip_set_input_callback(set_gateway);
/* Construct ip address from four bytes. */
uip_ipaddr(&hostaddr, 172, 16, rimeaddr_node_addr.u8[0],
rimeaddr_node_addr.u8[1]);
uip_ipaddr(&hostaddr, 172, 16, linkaddr_node_addr.u8[0],
linkaddr_node_addr.u8[1]);
/* Construct netmask from four bytes. */
uip_ipaddr(&netmask, 255,255,0,0);