From c0e115895d212bb902ccb2b7d2b67574c2e47a6c Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Wed, 25 Nov 2009 10:01:55 +0000
Subject: [PATCH] when a receiving radio is interfered by another transmission,
 the actual data received is corrupted.

---
 .../mspmote/interfaces/SkyByteRadio.java      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
index f17cd2222..031ce8c19 100755
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyByteRadio.java,v 1.15 2009/11/13 08:32:01 fros4943 Exp $
+ * $Id: SkyByteRadio.java,v 1.16 2009/11/25 10:01:55 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
@@ -173,7 +173,11 @@ public class SkyByteRadio extends Radio implements CustomDataRadio {
 
       /*logger.info("Delivering buffered packet data now: " + mote.getSimulation().getSimulationTime());*/
       for (byte b: crossBufferedData) {
-        cc2420.receivedByte(b);
+        if (isInterfered()) {
+          cc2420.receivedByte((byte)0xFF);
+        } else {
+          cc2420.receivedByte(b);
+        }
       }
       mote.requestImmediateWakeup();
       crossBufferedData = null;
@@ -218,7 +222,11 @@ public class SkyByteRadio extends Radio implements CustomDataRadio {
 
     /* Delivering data immediately */
     for (byte b: packetData) {
-      cc2420.receivedByte(b);
+      if (isInterfered()) {
+        cc2420.receivedByte((byte)0xFF);
+      } else {
+        cc2420.receivedByte(b);
+      }
     }
     mote.requestImmediateWakeup();
   }
@@ -235,7 +243,11 @@ public class SkyByteRadio extends Radio implements CustomDataRadio {
   public void receiveCustomData(Object data) {
     if (data instanceof CC2420RadioByte) {
       lastIncomingByte = (CC2420RadioByte) data;
-      cc2420.receivedByte(lastIncomingByte.getPacketData()[0]);
+      if (isInterfered()) {
+        cc2420.receivedByte((byte)0xFF);
+      } else {
+        cc2420.receivedByte(lastIncomingByte.getPacketData()[0]);
+      }
       mote.requestImmediateWakeup();
     }
   }