From a36e529df126165ac94fa0b9aae34b8f2c927636 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Mon, 6 Apr 2009 13:31:00 +0000
Subject: [PATCH] added configuration for panid

---
 platform/sky/contiki-conf.h     | 4 +++-
 platform/sky/contiki-sky-main.c | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 3fc9fdc60..9cb63e3ca 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.44 2009/04/06 13:23:14 nvt-se Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.45 2009/04/06 13:31:00 nifi Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -10,6 +10,8 @@
 
 #define PACKETBUF_CONF_ATTRS_INLINE 1
 
+#define IEEE802154_CONF_PANID       0xABCD
+
 #define SHELL_VARS_CONF_RAM_BEGIN 0x1100
 #define SHELL_VARS_CONF_RAM_END 0x2000
 
diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index cf44b0395..cf8a9e3c4 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-sky-main.c,v 1.50 2009/03/31 13:25:50 nifi Exp $
+ * @(#)$Id: contiki-sky-main.c,v 1.51 2009/04/06 13:31:00 nifi Exp $
  */
 
 #include <signal.h>
@@ -52,6 +52,7 @@
 
 #include "lib/random.h"
 
+#include "net/mac/frame802154.h"
 #include "net/mac/nullmac.h"
 #include "net/mac/xmac.h"
 #include "net/mac/lpp.h"
@@ -115,9 +116,6 @@ force_float_inclusion()
 /*---------------------------------------------------------------------------*/
 void uip_log(char *msg) { puts(msg); }
 /*---------------------------------------------------------------------------*/
-/* Radio stuff in network byte order. */
-static u16_t panId = 0x2024;
-
 #ifndef RF_CHANNEL
 #define RF_CHANNEL              26
 #endif
@@ -231,7 +229,7 @@ main(int argc, char **argv)
   ctimer_init();
 
   cc2420_init();
-  cc2420_set_pan_addr(panId, 0 /*XXX*/, ds2411_id);
+  cc2420_set_pan_addr(IEEE802154_PANID, 0 /*XXX*/, ds2411_id);
   cc2420_set_channel(RF_CHANNEL);
 #if WITH_NULLMAC
   rime_init(nullmac_init(&cc2420_driver));