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

Merge pull request #39 from adamdunkels/node-id

Browse source 
Fixed node-id compilation problems on the micaz and exp5438 platforms
This commit is contained in:
Nicolas Tsiftes 2012-11-21 00:18:11 -08:00
commit 39919655df
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(...)
#endif
extern unsigned char node_mac[8];
//SENSORS(&button_sensor);
/*---------------------------------------------------------------------------*/
#ifndef RF_CHANNEL

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

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