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

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.
2012-11-20 19:57:20 +01:00 · 2012-11-20 19:57:20 +01:00 · ec8c7e9be0
commit ec8c7e9be0
parent 9392ece509
46 changed files with 37 additions and 433 deletions
--- a/apps/deluge/deluge.c
+++ b/apps/deluge/deluge.c
@ -46,7 +46,7 @@
 #include "loader/elfloader.h"
 #include "lib/crc16.h"
 #include "lib/random.h"
-#include "node-id.h"
+#include "sys/node-id.h"
 #include "deluge.h"

 #if NETSIM
--- a/apps/rest-common/static-routing.c
+++ b/apps/rest-common/static-routing.c
@ -24,7 +24,7 @@

 #if !UIP_CONF_IPV6_RPL
 #include "contiki-net.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 void set_global_address(void)
 {
--- a/apps/shell/shell-sky.c
+++ b/apps/shell/shell-sky.c
@ -52,7 +52,7 @@
 #include "dev/sht11-sensor.h"
 #include "net/rime/timesynch.h"

-#include "node-id.h"
+#include "sys/node-id.h"

 #include <stdio.h>
 #include <string.h>
--- a/core/net/mac/ctdma_mac.c
+++ b/core/net/mac/ctdma_mac.c
@ -39,7 +39,7 @@
 #include "lib/memb.h"
 #include "lib/list.h"
 #include "dev/leds.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #include <string.h>
 #include <stdio.h>
--- a/core/net/mac/tdma_mac.c
+++ b/core/net/mac/tdma_mac.c
@ -39,7 +39,7 @@
 #include "lib/memb.h"
 #include "lib/list.h"
 #include "dev/leds.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #include <string.h>
 #include <stdio.h>
--- a/platform/redbee-econotag/node-id.h
+++ b/platform/redbee-econotag/node-id.h
--- a/examples/er-rest-example/static-routing.c
+++ b/examples/er-rest-example/static-routing.c
@ -21,7 +21,7 @@
 #endif

 #include "contiki-net.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 int node_rank;

--- a/examples/ipv6/simple-udp-rpl/unicast-sender.c
+++ b/examples/ipv6/simple-udp-rpl/unicast-sender.c
@ -38,7 +38,7 @@
 #include "net/uip-ds6.h"
 #include "net/uip-debug.h"

-#include "node-id.h"
+#include "sys/node-id.h"

 #include "simple-udp.h"
 #include "servreg-hack.h"
--- a/examples/rime/example-rucb.c
+++ b/examples/rime/example-rucb.c
@ -104,7 +104,7 @@ const static struct rucb_callbacks rucb_call = {write_chunk, read_chunk,
 						NULL};
 static struct rucb_conn rucb;
 /*---------------------------------------------------------------------------*/
-#include "node-id.h"
+#include "sys/node-id.h"

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

 PROCESS_THREAD(example_rudolph2_process, ev, data)
 {
--- a/examples/sky/test-deluge.c
+++ b/examples/sky/test-deluge.c
@ -40,7 +40,7 @@
 #include "contiki.h"
 #include "cfs/cfs.h"
 #include "deluge.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #include <stdio.h>
 #include <string.h>
--- a/examples/udp-stream/udp-stream.c
+++ b/examples/udp-stream/udp-stream.c
@ -41,7 +41,7 @@
 #include "contiki-net.h"
 #include "uip.h"
 #include "net/rpl/rpl.h"
-#include "node-id.h"
+#include "sys/node-id.h"
 #include "servreg-hack.h"

 #include "cfs/cfs.h"
--- a/platform/avr-raven/node-id.h
+++ b/platform/avr-raven/node-id.h
@ -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 */
--- a/platform/cooja/contiki-cooja-main.c
+++ b/platform/cooja/contiki-cooja-main.c
@ -58,7 +58,7 @@
 #include "dev/pir-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 */
--- a/platform/cooja/sys/node-id.h
+++ b/platform/cooja/sys/node-id.h
--- a/platform/esb/apps/burn-nodeid.c
+++ b/platform/esb/apps/burn-nodeid.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki.h"
 #include "dev/esb-sensors.h"
 #include "dev/rs232.h"
--- a/platform/esb/contiki-esb.h
+++ b/platform/esb/contiki-esb.h
@ -46,7 +46,7 @@
 #include "dev/serial-line.h"
 #include "dev/slip.h"

-#include "node-id.h"
+#include "sys/node-id.h"

 #include "dev/vib-sensor.h"
 #include "dev/pir-sensor.h"
@ -63,7 +63,7 @@

 #include "dev/leds.h"

-#include "node-id.h"
+#include "sys/node-id.h"

 void msp430_cpu_init(void);
 void init_lowlevel(void);
--- a/platform/esb/node-id.c
+++ b/platform/esb/node-id.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki-conf.h"
 #include "dev/eeprom.h"

--- a/platform/esb/node-id.h
+++ b/platform/esb/node-id.h
@ -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__ */
--- a/platform/exp5438/contiki-exp5438-main.c
+++ b/platform/exp5438/contiki-exp5438-main.c
@ -50,7 +50,7 @@
 #include "sys/autostart.h"
 #include "sys/profile.h"

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "lcd.h"
 #include "duty-cycle-scroller.h"

--- a/platform/exp5438/node-id.c
+++ b/platform/exp5438/node-id.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki-conf.h"
 #include "dev/xmem.h"
 #include <string.h>
--- a/platform/exp5438/node-id.h
+++ b/platform/exp5438/node-id.h
@ -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__ */
--- a/platform/iris/contiki-iris-main.c
+++ b/platform/iris/contiki-iris-main.c
@ -53,7 +53,7 @@

 #include "init-net.h"
 #include "dev/ds2401.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 /*---------------------------------------------------------------------------*/
 void
--- a/platform/iris/init-net.c
+++ b/platform/iris/init-net.c
@ -51,7 +51,7 @@
 #include "net/mac/frame802154.h"

 #include "dev/ds2401.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #if WITH_UIP6
 #include "net/uip-ds6.h"
--- a/platform/iris/node-id.c
+++ b/platform/iris/node-id.c
@ -31,7 +31,7 @@
 * @(#)$$
 */

-#include "node-id.h"
+#include "sys/node-id.h"

 uint16_t node_id = 0;

--- a/platform/iris/node-id.h
+++ b/platform/iris/node-id.h
@ -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 */
--- a/platform/micaz/contiki-micaz-main.c
+++ b/platform/micaz/contiki-micaz-main.c
@ -53,7 +53,7 @@

 #include "init-net.h"
 #include "dev/ds2401.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 /*---------------------------------------------------------------------------*/
 void
--- a/platform/micaz/init-net.c
+++ b/platform/micaz/init-net.c
@ -51,7 +51,7 @@
 #include "net/mac/frame802154.h"

 #include "dev/ds2401.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #if WITH_UIP6
 #include "net/uip-ds6.h"
--- a/platform/micaz/node-id.c
+++ b/platform/micaz/node-id.c
@ -31,7 +31,7 @@
 * @(#)$$
 */

-#include "node-id.h"
+#include "sys/node-id.h"

 uint16_t node_id = 0;

--- a/platform/micaz/node-id.h
+++ b/platform/micaz/node-id.h
@ -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 */
--- a/platform/msb430/apps/test-abc.c
+++ b/platform/msb430/apps/test-abc.c
@ -39,7 +39,7 @@

 #include "contiki.h"
 #include "net/rime.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #include <stdio.h>

--- a/platform/msb430/contiki-msb430.h
+++ b/platform/msb430/contiki-msb430.h
@ -49,7 +49,7 @@

 #include "lib/sensors.h"
 #include "net/rime.h"
-#include "node-id.h"
+#include "sys/node-id.h"

 #if WITH_SD
 #include "dev/sd.h"
--- a/platform/msb430/init-net-uip.c
+++ b/platform/msb430/init-net-uip.c
@ -39,7 +39,7 @@

 #include "contiki.h"
 #include "contiki-net.h"
-#include "node-id.h"
+#include "sys/node-id.h"
 #include "dev/slip.h"
 #include "dev/cc1020-uip.h"
 #include "contiki-msb430.h"
--- a/platform/msb430/node-id.c
+++ b/platform/msb430/node-id.c
@ -30,7 +30,7 @@
 *
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "dev/infomem.h"

 uint16_t node_id = 0;
--- a/platform/msb430/node-id.h
+++ b/platform/msb430/node-id.h
@ -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 */
--- a/platform/sky/apps/burn-nodeid.c
+++ b/platform/sky/apps/burn-nodeid.c
@ -39,7 +39,7 @@

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

--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@ -49,7 +49,7 @@

 #include "net/rime.h"

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "cfs-coffee-arch.h"
 #include "cfs/cfs-coffee.h"
 #include "sys/autostart.h"
--- a/platform/sky/node-id.c
+++ b/platform/sky/node-id.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki-conf.h"
 #include "dev/xmem.h"

--- a/platform/sky/node-id.h
+++ b/platform/sky/node-id.h
@ -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__ */
--- a/platform/wismote/contiki-wismote-main.c
+++ b/platform/wismote/contiki-wismote-main.c
@ -50,7 +50,7 @@

 #include "net/rime.h"

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "sys/autostart.h"
 #include "sys/profile.h"

--- a/platform/wismote/node-id.c
+++ b/platform/wismote/node-id.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki-conf.h"
 #include "dev/xmem.h"

--- a/platform/wismote/node-id.h
+++ b/platform/wismote/node-id.h
@ -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__ */
--- a/platform/z1/apps/burn-nodeid.c
+++ b/platform/z1/apps/burn-nodeid.c
@ -39,7 +39,7 @@

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

--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
@ -53,7 +53,7 @@

 #include "net/rime.h"

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "cfs-coffee-arch.h"
 #include "cfs/cfs-coffee.h"
 #include "sys/autostart.h"
@ -66,6 +66,7 @@

 SENSORS(&button_sensor);

+extern unsigned char node_mac[8];

 #if DCOSYNCH_CONF_ENABLED
 static struct timer mgt_timer;
--- a/platform/z1/node-id.c
+++ b/platform/z1/node-id.c
@ -37,7 +37,7 @@
 *         Adam Dunkels <adam@sics.se>
 */

-#include "node-id.h"
+#include "sys/node-id.h"
 #include "contiki-conf.h"
 #include "dev/xmem.h"
 #include <string.h>
--- a/platform/z1/node-id.h
+++ b/platform/z1/node-id.h
@ -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__ */