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

8
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -258,21 +258,21 @@ uint8_t i;
/* Set addresses BEFORE starting tcpip process */
rimeaddr_t addr;
linkaddr_t addr;
if (params_get_eui64(addr.u8)) {
PRINTA("Random EUI64 address generated\n");
}
#if UIP_CONF_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(rimeaddr_t));
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
addr.u8[1]=node_id&0xff;
addr.u8[0]=(node_id&0xff00)>>8;
PRINTA("Node ID from eeprom: %X\n",node_id);
#endif
rimeaddr_set_node_addr(&addr);
linkaddr_set_node_addr(&addr);
rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
rf230_set_channel(params_get_channel());
@ -283,7 +283,7 @@ uint8_t i;
#else
PRINTA("MAC address ");
uint8_t i;
for (i=sizeof(rimeaddr_t); i>0; i--){
for (i=sizeof(linkaddr_t); i>0; i--){
PRINTA("%x:",addr.u8[i-1]);
}
PRINTA("\n");