bugfix includes and names
This commit is contained in:
parent
a16849120f
commit
affe81cc6d
|
@ -38,8 +38,8 @@
|
|||
#include "contiki.h"
|
||||
#include "contiki-lib.h"
|
||||
#include "contiki-net.h"
|
||||
#include "net/uip.h"
|
||||
#include "net/uip-ds6.h"
|
||||
#include "net/ip/uip.h"
|
||||
#include "net/ipv6/uip-ds6.h"
|
||||
#include "net/rpl/rpl.h"
|
||||
|
||||
#include "net/netstack.h"
|
||||
|
@ -54,7 +54,7 @@
|
|||
#include "dev/leds.h"
|
||||
|
||||
#define DEBUG DEBUG_NONE
|
||||
#include "net/uip-debug.h"
|
||||
#include "net/ip/uip-debug.h"
|
||||
|
||||
uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011};
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
* Nicolas Tsiftes <nvt@sics.se>
|
||||
*/
|
||||
|
||||
#include "net/uip.h"
|
||||
#include "net/uip-ds6.h"
|
||||
#include "net/ip/uip.h"
|
||||
#include "net/ipv6/uip-ds6.h"
|
||||
#include "dev/slip.h"
|
||||
#include "dev/uart1.h"
|
||||
#include <string.h>
|
||||
|
@ -47,7 +47,7 @@
|
|||
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
|
||||
|
||||
#define DEBUG DEBUG_PRINT
|
||||
#include "net/uip-debug.h"
|
||||
#include "net/ip/uip-debug.h"
|
||||
|
||||
void set_prefix_64(uip_ipaddr_t *);
|
||||
|
||||
|
|
|
@ -168,7 +168,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;
|
||||
|
@ -208,7 +208,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;
|
||||
|
|
Loading…
Reference in a new issue