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

18
examples/rime/example-collect.c
View file

@ -55,7 +55,7 @@ PROCESS(example_collect_process, "Test collect process");
AUTOSTART_PROCESSES(&example_collect_process);
/*---------------------------------------------------------------------------*/
static void
recv(const rimeaddr_t *originator, uint8_t seqno, uint8_t hops)
recv(const linkaddr_t *originator, uint8_t seqno, uint8_t hops)
{
printf("Sink got message from %d.%d, seqno %d, hops %d: len %d '%s'\n",
originator->u8[0], originator->u8[1],
@ -75,8 +75,8 @@ PROCESS_THREAD(example_collect_process, ev, data)
collect_open(&tc, 130, COLLECT_ROUTER, &callbacks);
if(rimeaddr_node_addr.u8[0] == 1 &&
rimeaddr_node_addr.u8[1] == 0) {
if(linkaddr_node_addr.u8[0] == 1 &&
linkaddr_node_addr.u8[1] == 0) {
printf("I am sink\n");
collect_set_sink(&tc, 1);
}
@ -97,8 +97,8 @@ PROCESS_THREAD(example_collect_process, ev, data)
if(etimer_expired(&et)) {
static rimeaddr_t oldparent;
const rimeaddr_t *parent;
static linkaddr_t oldparent;
const linkaddr_t *parent;
printf("Sending\n");
packetbuf_clear();
@ -107,14 +107,14 @@ PROCESS_THREAD(example_collect_process, ev, data)
collect_send(&tc, 15);
parent = collect_parent(&tc);
if(!rimeaddr_cmp(parent, &oldparent)) {
if(!rimeaddr_cmp(&oldparent, &rimeaddr_null)) {
if(!linkaddr_cmp(parent, &oldparent)) {
if(!linkaddr_cmp(&oldparent, &linkaddr_null)) {
printf("#L %d 0\n", oldparent.u8[0]);
}
if(!rimeaddr_cmp(parent, &rimeaddr_null)) {
if(!linkaddr_cmp(parent, &linkaddr_null)) {
printf("#L %d 1\n", parent->u8[0]);
}
rimeaddr_copy(&oldparent, parent);
linkaddr_copy(&oldparent, parent);
}
}