From 8e59df78e271fe615e88eef4aed53908799bb122 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Fri, 7 Oct 2011 15:29:43 +0200
Subject: [PATCH] Autoenable RX after TX + removed exception check

---
 core/dev/cc2520.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/core/dev/cc2520.c b/core/dev/cc2520.c
index 8d5ebb2e7..ec1442ea9 100644
--- a/core/dev/cc2520.c
+++ b/core/dev/cc2520.c
@@ -321,7 +321,8 @@ cc2520_init(void)
   /* Disable filter on @ (remove if you want to address specific wismote) */
   setreg(CC2520_FRMFILT0,    0x00);
 #endif /* CC2520_CONF_AUTOACK */
-
+  /* SET_RXENMASK_ON_TX */
+  setreg(CC2520_FRMCTRL1,          1);
   /* Set FIFOP threshold to maximum .*/
   setreg(CC2520_FIFOPCTRL,   FIFOP_THR(0x7F));
 
@@ -338,7 +339,6 @@ static int
 cc2520_transmit(unsigned short payload_len)
 {
   int i, txpower;
-  uint8_t reg;
 
   GET_LOCK();
 
@@ -415,14 +415,9 @@ cc2520_transmit(unsigned short payload_len)
         set_txpower(txpower & 0xff);
       }
 
-      reg = getreg(CC2520_EXCFLAG0);
       RELEASE_LOCK();
 
-      if (reg & TX_FRM_DONE) {
-        return RADIO_TX_OK;
-      } else {
-        return RADIO_TX_COLLISION;
-      }
+      return RADIO_TX_OK;
     }
   }