From 0c8b200987f9e9850b6974b0fb8ff070c4963281 Mon Sep 17 00:00:00 2001
From: joxe <joxe>
Date: Tue, 28 Jul 2009 22:24:53 +0000
Subject: [PATCH] added autoack configuration for CC2420 and reversed long ieee
 address for address recognition

---
 core/dev/cc2420.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c
index 9844d7248..abb62bf37 100644
--- a/core/dev/cc2420.c
+++ b/core/dev/cc2420.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc2420.c,v 1.30 2009/04/29 11:38:50 adamdunkels Exp $
+ * @(#)$Id: cc2420.c,v 1.31 2009/07/28 22:24:53 joxe Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
@@ -70,6 +70,10 @@
 #define CC2420_CONF_CHECKSUM 0
 #endif /* CC2420_CONF_CHECKSUM */
 
+#ifndef CC2420_CONF_AUTOACK
+#define CC2420_CONF_AUTOACK 0
+#endif /* CC2420_CONF_AUTOACK */
+
 #if CC2420_CONF_CHECKSUM
 #include "lib/crc16.h"
 #define CHECKSUM_LEN 2
@@ -273,14 +277,13 @@ cc2420_init(void)
   /* Turn on the crystal oscillator. */
   strobe(CC2420_SXOSCON);
 
-  /* Turn off automatic packet acknowledgment. */
+  /* Turn on/off automatic packet acknowledgment and address decoding. */
   reg = getreg(CC2420_MDMCTRL0);
-  reg &= ~AUTOACK;
-  setreg(CC2420_MDMCTRL0, reg);
-
-  /* Turn off address decoding. */
-  reg = getreg(CC2420_MDMCTRL0);
-  reg &= ~ADR_DECODE;
+#if CC2420_CONF_AUTOACK
+  reg |= AUTOACK | ADR_DECODE;
+#else
+  reg &= ~(AUTOACK | ADR_DECODE);
+#endif /* CC2420_CONF_AUTOACK */
   setreg(CC2420_MDMCTRL0, reg);
 
   /* Change default values as recomended in the data sheet, */
@@ -512,7 +515,12 @@ cc2420_set_pan_addr(unsigned pan,
   FASTSPI_WRITE_RAM_LE(&pan, CC2420RAM_PANID, 2, f);
   FASTSPI_WRITE_RAM_LE(&addr, CC2420RAM_SHORTADDR, 2, f);
   if(ieee_addr != NULL) {
-    FASTSPI_WRITE_RAM_LE(ieee_addr, CC2420RAM_IEEEADDR, 8, f);
+    uint8_t addr[8];
+    /* LSB first, MSB last for 802.15.4 addresses in CC2420 */
+    for (f = 0; f < 8; f++) {
+      addr[7 - f] = ieee_addr[f];
+    }
+    FASTSPI_WRITE_RAM_LE(addr, CC2420RAM_IEEEADDR, 8, f);
   }
 }
 /*---------------------------------------------------------------------------*/