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
core/net/mac/mac-sequence.c
View file

@ -50,7 +50,7 @@
#include "net/rime/rime.h"
struct seqno {
rimeaddr_t sender;
linkaddr_t sender;
uint8_t seqno;
};
@ -72,7 +72,7 @@ mac_sequence_is_duplicate(void)
* packet with the last few ones we saw.
*/
for(i = 0; i < MAX_SEQNOS; ++i) {
if(rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER),
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER),
&received_seqnos[i].sender)) {
if(packetbuf_attr(PACKETBUF_ATTR_PACKET_ID) == received_seqnos[i].seqno) {
/* Duplicate packet. */
@ -91,7 +91,7 @@ mac_sequence_register_seqno(void)
/* Locate possible previous sequence number for this address. */
for(i = 0; i < MAX_SEQNOS; ++i) {
if(rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER),
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER),
&received_seqnos[i].sender)) {
i++;
break;
@ -103,7 +103,7 @@ mac_sequence_register_seqno(void)
memcpy(&received_seqnos[j], &received_seqnos[j - 1], sizeof(struct seqno));
}
received_seqnos[0].seqno = packetbuf_attr(PACKETBUF_ATTR_PACKET_ID);
rimeaddr_copy(&received_seqnos[0].sender,
linkaddr_copy(&received_seqnos[0].sender,
packetbuf_addr(PACKETBUF_ADDR_SENDER));
}
/*---------------------------------------------------------------------------*/