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

Cleanup of the node-id.h files. The node-id.h file contains

Browse source 
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
This commit is contained in:
Adam Dunkels 2012-11-20 19:57:20 +01:00
parent 9392ece509
commit ec8c7e9be0
46 changed files with 37 additions and 433 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/deluge/deluge.c
View file

@ -46,7 +46,7 @@
#include "loader/elfloader.h" #include "loader/elfloader.h"
#include "lib/crc16.h" #include "lib/crc16.h"
#include "lib/random.h" #include "lib/random.h"
#include "node-id.h" #include "sys/node-id.h"
#include "deluge.h" #include "deluge.h"
#if NETSIM #if NETSIM

2
apps/rest-common/static-routing.c
View file

@ -24,7 +24,7 @@
#if !UIP_CONF_IPV6_RPL #if !UIP_CONF_IPV6_RPL
#include "contiki-net.h" #include "contiki-net.h"
#include "node-id.h" #include "sys/node-id.h"
void set_global_address(void) void set_global_address(void)
{ {

2
apps/shell/shell-sky.c
View file

@ -52,7 +52,7 @@
#include "dev/sht11-sensor.h" #include "dev/sht11-sensor.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"
#include "node-id.h" #include "sys/node-id.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
core/net/mac/ctdma_mac.c
View file

@ -39,7 +39,7 @@
#include "lib/memb.h" #include "lib/memb.h"
#include "lib/list.h" #include "lib/list.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "node-id.h" #include "sys/node-id.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

2
core/net/mac/tdma_mac.c
View file

@ -39,7 +39,7 @@
#include "lib/memb.h" #include "lib/memb.h"
#include "lib/list.h" #include "lib/list.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "node-id.h" #include "sys/node-id.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

0
platform/redbee-econotag/node-id.h → core/sys/node-id.h
View file

2
examples/er-rest-example/static-routing.c
View file

@ -21,7 +21,7 @@
#endif #endif
#include "contiki-net.h" #include "contiki-net.h"
#include "node-id.h" #include "sys/node-id.h"
int node_rank; int node_rank;

2
examples/ipv6/simple-udp-rpl/unicast-sender.c
View file

@ -38,7 +38,7 @@
#include "net/uip-ds6.h" #include "net/uip-ds6.h"
#include "net/uip-debug.h" #include "net/uip-debug.h"
#include "node-id.h" #include "sys/node-id.h"
#include "simple-udp.h" #include "simple-udp.h"
#include "servreg-hack.h" #include "servreg-hack.h"

2
examples/rime/example-rucb.c
View file

@ -104,7 +104,7 @@ const static struct rucb_callbacks rucb_call = {write_chunk, read_chunk,
NULL}; NULL};
static struct rucb_conn rucb; static struct rucb_conn rucb;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#include "node-id.h" #include "sys/node-id.h"
PROCESS_THREAD(example_rucb_process, ev, data) PROCESS_THREAD(example_rucb_process, ev, data)
{ {

2
examples/rime/example-rudolph2.c
View file

@ -140,7 +140,7 @@ const static struct rudolph2_callbacks rudolph2_call = {write_chunk,
read_chunk}; read_chunk};
static struct rudolph2_conn rudolph2; static struct rudolph2_conn rudolph2;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#include "node-id.h" #include "sys/node-id.h"
PROCESS_THREAD(example_rudolph2_process, ev, data) PROCESS_THREAD(example_rudolph2_process, ev, data)
{ {

2
examples/sky/test-deluge.c
View file

@ -40,7 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "deluge.h" #include "deluge.h"
#include "node-id.h" #include "sys/node-id.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
examples/udp-stream/udp-stream.c
View file

@ -41,7 +41,7 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "uip.h" #include "uip.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "node-id.h" #include "sys/node-id.h"
#include "servreg-hack.h" #include "servreg-hack.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"

45
platform/avr-raven/node-id.h
View file

@ -1,45 +0,0 @@
/*
* Copyright (c) 2005, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef NODE_ID_H
#define NODE_ID_H
#include "contiki-conf.h"
void node_id_restore(void);
void node_id_burn(uint16_t node_id);
extern uint16_t node_id;
#endif /* !NODE_ID_H */

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

@ -58,7 +58,7 @@
#include "dev/pir-sensor.h" #include "dev/pir-sensor.h"
#include "dev/vib-sensor.h" #include "dev/vib-sensor.h"
#include "node-id.h" #include "sys/node-id.h"
/* JNI-defined functions, depends on the environment variable CLASSNAME */ /* JNI-defined functions, depends on the environment variable CLASSNAME */

0
platform/cooja/node-id.h → platform/cooja/sys/node-id.h
View file

2
platform/esb/apps/burn-nodeid.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki.h" #include "contiki.h"
#include "dev/esb-sensors.h" #include "dev/esb-sensors.h"
#include "dev/rs232.h" #include "dev/rs232.h"

4
platform/esb/contiki-esb.h
View file

@ -46,7 +46,7 @@
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "node-id.h" #include "sys/node-id.h"
#include "dev/vib-sensor.h" #include "dev/vib-sensor.h"
#include "dev/pir-sensor.h" #include "dev/pir-sensor.h"
@ -63,7 +63,7 @@
#include "dev/leds.h" #include "dev/leds.h"
#include "node-id.h" #include "sys/node-id.h"
void msp430_cpu_init(void); void msp430_cpu_init(void);
void init_lowlevel(void); void init_lowlevel(void);

2
platform/esb/node-id.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include "dev/eeprom.h" #include "dev/eeprom.h"

43
platform/esb/node-id.h
View file

@ -1,43 +0,0 @@
/*
* Copyright (c) 2005, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef __NODE_ID_H__
#define __NODE_ID_H__
void node_id_restore(void);
void node_id_burn(unsigned short node_id);
extern unsigned short node_id;
#endif /* __NODE_ID_H__ */

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

@ -50,7 +50,7 @@
#include "sys/autostart.h" #include "sys/autostart.h"
#include "sys/profile.h" #include "sys/profile.h"
#include "node-id.h" #include "sys/node-id.h"
#include "lcd.h" #include "lcd.h"
#include "duty-cycle-scroller.h" #include "duty-cycle-scroller.h"

2
platform/exp5438/node-id.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include "dev/xmem.h" #include "dev/xmem.h"
#include <string.h> #include <string.h>

44
platform/exp5438/node-id.h
View file

@ -1,44 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef __NODE_ID_H__
#define __NODE_ID_H__
void node_id_restore(void);
void node_id_burn(unsigned short node_id);
extern unsigned short node_id;
extern unsigned char node_mac[8];
#endif /* __NODE_ID_H__ */

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

@ -53,7 +53,7 @@
#include "init-net.h" #include "init-net.h"
#include "dev/ds2401.h" #include "dev/ds2401.h"
#include "node-id.h" #include "sys/node-id.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

2
platform/iris/init-net.c
View file

@ -51,7 +51,7 @@
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "dev/ds2401.h" #include "dev/ds2401.h"
#include "node-id.h" #include "sys/node-id.h"
#if WITH_UIP6 #if WITH_UIP6
#include "net/uip-ds6.h" #include "net/uip-ds6.h"

2
platform/iris/node-id.c
View file

@ -31,7 +31,7 @@
* @(#)$$ * @(#)$$
*/ */
#include "node-id.h" #include "sys/node-id.h"
uint16_t node_id = 0; uint16_t node_id = 0;

45
platform/iris/node-id.h
View file

@ -1,45 +0,0 @@
/*
* Copyright (c) 2005, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef NODE_ID_H
#define NODE_ID_H
#include "contiki-conf.h"
void node_id_restore(void);
void node_id_burn(uint16_t node_id);
extern uint16_t node_id;
#endif /* !NODE_ID_H */

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

@ -53,7 +53,7 @@
#include "init-net.h" #include "init-net.h"
#include "dev/ds2401.h" #include "dev/ds2401.h"
#include "node-id.h" #include "sys/node-id.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

2
platform/micaz/init-net.c
View file

@ -51,7 +51,7 @@
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "dev/ds2401.h" #include "dev/ds2401.h"
#include "node-id.h" #include "sys/node-id.h"
#if WITH_UIP6 #if WITH_UIP6
#include "net/uip-ds6.h" #include "net/uip-ds6.h"

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

@ -31,7 +31,7 @@
* @(#)$$ * @(#)$$
*/ */
#include "node-id.h" #include "sys/node-id.h"
uint16_t node_id = 0; uint16_t node_id = 0;

45
platform/micaz/node-id.h
View file

@ -1,45 +0,0 @@
/*
* Copyright (c) 2005, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef NODE_ID_H
#define NODE_ID_H
#include "contiki-conf.h"
void node_id_restore(void);
void node_id_burn(uint16_t node_id);
extern uint16_t node_id;
#endif /* !NODE_ID_H */

2
platform/msb430/apps/test-abc.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "net/rime.h" #include "net/rime.h"
#include "node-id.h" #include "sys/node-id.h"
#include <stdio.h> #include <stdio.h>

2
platform/msb430/contiki-msb430.h
View file

@ -49,7 +49,7 @@
#include "lib/sensors.h" #include "lib/sensors.h"
#include "net/rime.h" #include "net/rime.h"
#include "node-id.h" #include "sys/node-id.h"
#if WITH_SD #if WITH_SD
#include "dev/sd.h" #include "dev/sd.h"

2
platform/msb430/init-net-uip.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "node-id.h" #include "sys/node-id.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "dev/cc1020-uip.h" #include "dev/cc1020-uip.h"
#include "contiki-msb430.h" #include "contiki-msb430.h"

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

@ -30,7 +30,7 @@
* *
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "dev/infomem.h" #include "dev/infomem.h"
uint16_t node_id = 0; uint16_t node_id = 0;

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

@ -1,45 +0,0 @@
/*
* Copyright (c) 2005, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef NODE_ID_H
#define NODE_ID_H
#include "contiki-conf.h"
void node_id_restore(void);
void node_id_burn(uint16_t node_id);
extern uint16_t node_id;
#endif /* !NODE_ID_H */

2
platform/sky/apps/burn-nodeid.c
View file

@ -39,7 +39,7 @@
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "node-id.h" #include "sys/node-id.h"
#include "contiki.h" #include "contiki.h"
#include "sys/etimer.h" #include "sys/etimer.h"

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

@ -49,7 +49,7 @@
#include "net/rime.h" #include "net/rime.h"
#include "node-id.h" #include "sys/node-id.h"
#include "cfs-coffee-arch.h" #include "cfs-coffee-arch.h"
#include "cfs/cfs-coffee.h" #include "cfs/cfs-coffee.h"
#include "sys/autostart.h" #include "sys/autostart.h"

2
platform/sky/node-id.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include "dev/xmem.h" #include "dev/xmem.h"

43
platform/sky/node-id.h
View file

@ -1,43 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef __NODE_ID_H__
#define __NODE_ID_H__
void node_id_restore(void);
void node_id_burn(unsigned short node_id);
extern unsigned short node_id;
#endif /* __NODE_ID_H__ */

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

@ -50,7 +50,7 @@
#include "net/rime.h" #include "net/rime.h"
#include "node-id.h" #include "sys/node-id.h"
#include "sys/autostart.h" #include "sys/autostart.h"
#include "sys/profile.h" #include "sys/profile.h"

2
platform/wismote/node-id.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include "dev/xmem.h" #include "dev/xmem.h"

43
platform/wismote/node-id.h
View file

@ -1,43 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef __NODE_ID_H__
#define __NODE_ID_H__
void node_id_restore(void);
void node_id_burn(unsigned short node_id);
extern unsigned short node_id;
#endif /* __NODE_ID_H__ */

2
platform/z1/apps/burn-nodeid.c
View file

@ -39,7 +39,7 @@
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "node-id.h" #include "sys/node-id.h"
#include "contiki.h" #include "contiki.h"
#include "sys/etimer.h" #include "sys/etimer.h"

3
platform/z1/contiki-z1-main.c
View file

@ -53,7 +53,7 @@
#include "net/rime.h" #include "net/rime.h"
#include "node-id.h" #include "sys/node-id.h"
#include "cfs-coffee-arch.h" #include "cfs-coffee-arch.h"
#include "cfs/cfs-coffee.h" #include "cfs/cfs-coffee.h"
#include "sys/autostart.h" #include "sys/autostart.h"
@ -66,6 +66,7 @@
SENSORS(&button_sensor); SENSORS(&button_sensor);
extern unsigned char node_mac[8];
#if DCOSYNCH_CONF_ENABLED #if DCOSYNCH_CONF_ENABLED
static struct timer mgt_timer; static struct timer mgt_timer;

2
platform/z1/node-id.c
View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "node-id.h" #include "sys/node-id.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include "dev/xmem.h" #include "dev/xmem.h"
#include <string.h> #include <string.h>

44
platform/z1/node-id.h
View file

@ -1,44 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
*/
#ifndef __NODE_ID_H__
#define __NODE_ID_H__
void node_id_restore(void);
void node_id_burn(unsigned short node_id);
extern unsigned short node_id;
extern unsigned char node_mac[8];
#endif /* __NODE_ID_H__ */