From 29335f2f7de66635fa4bfd82ba4b32c508fec3f4 Mon Sep 17 00:00:00 2001
From: joxe <joxe>
Date: Fri, 19 Mar 2010 14:08:15 +0000
Subject: [PATCH] added possibility to hard-code 7 bytes of the MAC address -
 last byte picked from nodeid

---
 platform/sky/contiki-sky-main.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index 2708443fb..8482c9e38 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.77 2010/03/19 13:28:27 adamdunkels Exp $
+ * @(#)$Id: contiki-sky-main.c,v 1.78 2010/03/19 14:08:15 joxe Exp $
  */
 
 #include <signal.h>
@@ -222,7 +222,7 @@ main(int argc, char **argv)
      with an Ethernet MAC address - byte 0 (byte 2 in the DS ID)
      cannot be odd. */
   ds2411_id[2] &= 0xfe;
-  
+
   leds_on(LEDS_BLUE);
   xmem_init();
 
@@ -236,6 +236,15 @@ main(int argc, char **argv)
   /* Restore node id if such has been stored in external mem */
   node_id_restore();
 
+  /* for setting "hardcoded" IEEE 802.15.4 MAC addresses */
+#ifdef IEEE_802154_MAC_ADDRESS
+  {
+    uint8_t ieee[] = IEEE_802154_MAC_ADDRESS;
+    memcpy(ds2411_id, ieee, sizeof(uip_lladdr.addr));
+    ds2411_id[7] = node_id & 0xff;
+  }
+#endif
+
   random_init(ds2411_id[0] + node_id);
   
   leds_off(LEDS_BLUE);