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

use uint16_t to be specific about id type size.

Browse source
This commit is contained in:
nvt-se 2007-09-14 19:24:45 +00:00
parent 5e7a435959
commit 87018b2af5
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
platform/msb430/node-id.c
View file

@ -28,28 +28,28 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: node-id.c,v 1.2 2007/08/20 11:01:13 nvt-se Exp $ * $Id: node-id.c,v 1.3 2007/09/14 19:24:45 nvt-se Exp $
*/ */
#include "node-id.h" #include "node-id.h"
#include "contiki-conf.h"
#include "dev/infomem.h" #include "dev/infomem.h"
unsigned short node_id = 0; uint16_t node_id = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
node_id_restore(void) node_id_restore(void)
{ {
unsigned short newid[2]; uint16_t newid[2];
infomem_read(newid, INFOMEM_NODE_ID, 2 * sizeof(node_id)); infomem_read(newid, INFOMEM_NODE_ID, sizeof(newid));
node_id = ( newid[0] == 0xdead ) ? newid[1] : newid[0]; node_id = ( newid[0] == 0xdead ) ? newid[1] : newid[0];
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
node_id_burn(unsigned short id) node_id_burn(uint16_t id)
{ {
unsigned short buffer[2] = { 0xdead, id }; uint16_t buffer[2] = { 0xdead, id };
infomem_write(INFOMEM_NODE_ID, 1, buffer, 2 * sizeof(node_id)); infomem_write(INFOMEM_NODE_ID, 1, buffer, sizeof(buffer));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

14
platform/msb430/node-id.h
View file

@ -30,15 +30,17 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: node-id.h,v 1.2 2007/08/20 11:01:13 nvt-se Exp $ * $Id: node-id.h,v 1.3 2007/09/14 19:24:45 nvt-se Exp $
*/ */
#ifndef __NODE_ID_H__ #ifndef NODE_ID_H
#define __NODE_ID_H__ #define NODE_ID_H
#include "contiki-conf.h"
void node_id_restore(void); void node_id_restore(void);
void node_id_burn(unsigned short node_id); void node_id_burn(uint16_t node_id);
extern unsigned short node_id; extern uint16_t node_id;
#endif /* __NODE_ID_H__ */ #endif /* !NODE_ID_H */