deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed compilation problems on the micaz and exp5438 platforms due to the node-id change

Browse source
This commit is contained in:
Adam Dunkels 2012-11-20 21:15:55 +01:00
parent 5a1661dfbf
commit e178787999
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/exp5438/contiki-exp5438-main.c
View file

@ -67,6 +67,8 @@
#define PRINTF(...) #define PRINTF(...)
#endif #endif
extern unsigned char node_mac[8];
//SENSORS(&button_sensor); //SENSORS(&button_sensor);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifndef RF_CHANNEL #ifndef RF_CHANNEL

5
platform/micaz/node-id.c
View file

@ -31,9 +31,10 @@
* @(#)$$ * @(#)$$
*/ */
#include "contiki-conf.h"
#include "sys/node-id.h" #include "sys/node-id.h"
uint16_t node_id = 0; unsigned short node_id = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -50,7 +51,7 @@ node_id_restore(void)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
node_id_burn(uint16_t id) node_id_burn(unsigned short id)
{ {
uint16_t buffer[2] = { 0xdead, id }; uint16_t buffer[2] = { 0xdead, id };
uint8_t volatile sreg; uint8_t volatile sreg;