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
apps/shell/shell-rime.c
View file

@ -200,8 +200,8 @@ PROCESS_THREAD(shell_routes_process, ev, data)
msg.len = 4;
for(i = 0; i < route_num(); ++i) {
r = route_get(i);
rimeaddr_copy((rimeaddr_t *)&msg.dest, &r->dest);
rimeaddr_copy((rimeaddr_t *)&msg.nexthop, &r->nexthop);
linkaddr_copy((linkaddr_t *)&msg.dest, &r->dest);
linkaddr_copy((linkaddr_t *)&msg.nexthop, &r->nexthop);
msg.hop_count = r->cost;
msg.seqno = r->seqno;
shell_output(&routes_command, &msg, sizeof(msg), "", 0);
@ -292,7 +292,7 @@ PROCESS_THREAD(shell_send_process, ev, data)
}
/*---------------------------------------------------------------------------*/
static void
recv_collect(const rimeaddr_t *originator, uint8_t seqno, uint8_t hops)
recv_collect(const linkaddr_t *originator, uint8_t seqno, uint8_t hops)
{
struct collect_msg collect_msg;
char *dataptr;
@ -323,7 +323,7 @@ recv_collect(const rimeaddr_t *originator, uint8_t seqno, uint8_t hops)
if(collect_msg.crc == crc16_data(dataptr, len, 0)) {
msg.len = 5 + (packetbuf_datalen() - COLLECT_MSG_HDRSIZE) / 2;
rimeaddr_copy((rimeaddr_t *)&msg.originator, originator);
linkaddr_copy((linkaddr_t *)&msg.originator, originator);
msg.seqno = seqno;
msg.hops = hops;
msg.latency = latency;