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
tools/stm32w/uip6_bridge/dev/slip.c
View file

@ -36,7 +36,7 @@
#include <string.h>
#include "contiki.h"
#include "net/rimeaddr.h"
#include "net/linkaddr.h"
#include "sys/ctimer.h"
#include "net/ip/uip.h"
@ -264,9 +264,9 @@ slip_poll_handler(uint8_t *outbuf, uint16_t blen)
/* this is just a test so far... just to see if it works */
slip_arch_writeb('!');
slip_arch_writeb('M');
for(j = 0; j < RIMEADDR_SIZE; j++) {
slip_arch_writeb(hexchar[rimeaddr_node_addr.u8[j] >> 4]);
slip_arch_writeb(hexchar[rimeaddr_node_addr.u8[j] & 15]);
for(j = 0; j < LINKADDR_SIZE; j++) {
slip_arch_writeb(hexchar[linkaddr_node_addr.u8[j] >> 4]);
slip_arch_writeb(hexchar[linkaddr_node_addr.u8[j] & 15]);
}
slip_arch_writeb(SLIP_END);
return 0;

6
tools/stm32w/uip6_bridge/sicslow_ethernet.c
View file

@ -339,7 +339,7 @@ void mac_LowpanToEthernet(void)
ETHBUF(uip_buf)->type = htons(UIP_ETHTYPE_IPV6);
//Check for broadcast message
if(rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &rimeaddr_null)) {
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &linkaddr_null)) {
/* if( ( parsed_frame->fcf->destAddrMode == SHORTADDRMODE) && */
/* ( parsed_frame->dest_addr->addr16 == 0xffff) ) { */
ETHBUF(uip_buf)->dest.addr[0] = 0x33;
@ -825,7 +825,7 @@ void mac_logTXtoEthernet(frame_create_params_t *p,frame_result_t *frame_result)
//Check for broadcast message
//if(rimeaddr_cmp((const rimeaddr_t *)destAddr, &rimeaddr_null)) {
//if(linkaddr_cmp((const linkaddr_t *)destAddr, &linkaddr_null)) {
if( ( p->fcf.destAddrMode == SHORTADDRMODE) &&
( p->dest_addr.addr16 == 0xffff) ) {
ETHBUF(raw_buf)->dest.addr[0] = 0x33;
@ -940,7 +940,7 @@ void mac_802154raw(const struct radio_driver *radio)
#if 0
//Check for broadcast message
//if(rimeaddr_cmp((const rimeaddr_t *)destAddr, &rimeaddr_null)) {
//if(linkaddr_cmp((const linkaddr_t *)destAddr, &linkaddr_null)) {
if( ( parsed_frame->fcf->destAddrMode == SHORTADDRMODE) &&
( parsed_frame->dest_addr->addr16 == 0xffff) ) {
ETHBUF(raw_buf)->dest.addr[0] = 0x33;