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
core/net/rime/mesh.c
View file

@ -62,8 +62,8 @@
/*---------------------------------------------------------------------------*/
static void
data_packet_received(struct multihop_conn *multihop,
const rimeaddr_t *from,
const rimeaddr_t *prevhop, uint8_t hops)
const linkaddr_t *from,
const linkaddr_t *prevhop, uint8_t hops)
{
struct mesh_conn *c = (struct mesh_conn *)
((char *)multihop - offsetof(struct mesh_conn, multihop));
@ -81,11 +81,11 @@ data_packet_received(struct multihop_conn *multihop,
}
}
/*---------------------------------------------------------------------------*/
static rimeaddr_t *
static linkaddr_t *
data_packet_forward(struct multihop_conn *multihop,
const rimeaddr_t *originator,
const rimeaddr_t *dest,
const rimeaddr_t *prevhop, uint8_t hops)
const linkaddr_t *originator,
const linkaddr_t *dest,
const linkaddr_t *prevhop, uint8_t hops)
{
struct route_entry *rt;
struct mesh_conn *c = (struct mesh_conn *)
@ -99,7 +99,7 @@ data_packet_forward(struct multihop_conn *multihop,
PRINTF("data_packet_forward: queueing data, sending rreq\n");
c->queued_data = queuebuf_new_from_packetbuf();
rimeaddr_copy(&c->queued_data_dest, dest);
linkaddr_copy(&c->queued_data_dest, dest);
route_discovery_discover(&c->route_discovery_conn, dest, PACKET_TIMEOUT);
return NULL;
@ -111,7 +111,7 @@ data_packet_forward(struct multihop_conn *multihop,
}
/*---------------------------------------------------------------------------*/
static void
found_route(struct route_discovery_conn *rdc, const rimeaddr_t *dest)
found_route(struct route_discovery_conn *rdc, const linkaddr_t *dest)
{
struct route_entry *rt;
struct mesh_conn *c = (struct mesh_conn *)
@ -120,7 +120,7 @@ found_route(struct route_discovery_conn *rdc, const rimeaddr_t *dest)
PRINTF("found_route\n");
if(c->queued_data != NULL &&
rimeaddr_cmp(dest, &c->queued_data_dest)) {
linkaddr_cmp(dest, &c->queued_data_dest)) {
queuebuf_to_packetbuf(c->queued_data);
queuebuf_free(c->queued_data);
c->queued_data = NULL;
@ -181,12 +181,12 @@ mesh_close(struct mesh_conn *c)
}
/*---------------------------------------------------------------------------*/
int
mesh_send(struct mesh_conn *c, const rimeaddr_t *to)
mesh_send(struct mesh_conn *c, const linkaddr_t *to)
{
int could_send;
PRINTF("%d.%d: mesh_send to %d.%d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
to->u8[0], to->u8[1]);
could_send = multihop_send(&c->multihop, to);