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

6
regression-tests/04-rime/code/mesh-node.c
View file

@ -37,10 +37,10 @@ PROCESS(mesh_node_process, "Mesh node");
AUTOSTART_PROCESSES(&mesh_node_process);
/*---------------------------------------------------------------------------*/
static void
mesh_recv(struct mesh_conn *c, const rimeaddr_t *from, uint8_t hops)
mesh_recv(struct mesh_conn *c, const linkaddr_t *from, uint8_t hops)
{
printf("%d.%d: mesh message received '%s'\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
(char *)packetbuf_dataptr());
}
const static struct mesh_callbacks mesh_callback = {mesh_recv, NULL, NULL};
@ -57,7 +57,7 @@ PROCESS_THREAD(mesh_node_process, ev, data)
etimer_set(&et, CLOCK_SECOND * 20);
PROCESS_WAIT_UNTIL(etimer_expired(&et));
if(node_id == 200) {
rimeaddr_t receiver;
linkaddr_t receiver;
packetbuf_copyfrom("Hello, world", 13);
receiver.u8[0] = 1;

2
regression-tests/04-rime/code/trickle-node.c
View file

@ -40,7 +40,7 @@ static void
trickle_recv(struct trickle_conn *c)
{
printf("%d.%d: trickle message received '%s'\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
(char *)packetbuf_dataptr());
}
const static struct trickle_callbacks trickle_callback = {trickle_recv};