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

4
platform/avr-atmega128rfa1/contiki-conf.h
View file

@ -143,7 +143,7 @@ typedef unsigned short uip_stats_t;
#define RDC_CONF_MCU_SLEEP 1
#if UIP_CONF_IPV6
#define RIMEADDR_CONF_SIZE 8
#define LINKADDR_CONF_SIZE 8
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1
@ -151,7 +151,7 @@ typedef unsigned short uip_stats_t;
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else
/* ip4 should build but is largely untested */
#define RIMEADDR_CONF_SIZE 2
#define LINKADDR_CONF_SIZE 2
#define NETSTACK_CONF_NETWORK rime_driver
#endif

8
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -258,21 +258,21 @@ uint8_t i;
/* Set addresses BEFORE starting tcpip process */
rimeaddr_t addr;
linkaddr_t addr;
if (params_get_eui64(addr.u8)) {
PRINTA("Random EUI64 address generated\n");
}
#if UIP_CONF_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(rimeaddr_t));
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
addr.u8[1]=node_id&0xff;
addr.u8[0]=(node_id&0xff00)>>8;
PRINTA("Node ID from eeprom: %X\n",node_id);
#endif
rimeaddr_set_node_addr(&addr);
linkaddr_set_node_addr(&addr);
rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
rf230_set_channel(params_get_channel());
@ -283,7 +283,7 @@ uint8_t i;
#else
PRINTA("MAC address ");
uint8_t i;
for (i=sizeof(rimeaddr_t); i>0; i--){
for (i=sizeof(linkaddr_t); i>0; i--){
PRINTA("%x:",addr.u8[i-1]);
}
PRINTA("\n");

4
platform/avr-atmega128rfa1/params.c
View file

@ -159,7 +159,7 @@ params_get_channel(void) {
uint8_t
params_get_eui64(uint8_t *eui64) {
cli();
eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(rimeaddr_t));
eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(linkaddr_t));
sei();
#if CONTIKI_CONF_RANDOM_MAC
return randomeui64;
@ -199,7 +199,7 @@ params_get_channel() {
}
uint8_t
params_get_eui64(uint8_t *eui64) {
size_t size = sizeof(rimeaddr_t);
size_t size = sizeof(linkaddr_t);
if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)eui64, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get EUI64 MAC\n");
return 0;