Fix stupid crc bug

diff --git a/tos/chips/cc1000/CC1000ActiveMessageP.nc b/tos/chips/cc1000/CC1000ActiveMessageP.nc
index 118c8a810fb8667f2a168a65d650c15f8c28a1a2..4fc6bd4dad3b7985e6dff380e60d348b845b2791 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageP.nc
@@ -54,6 +54,10 @@ implementation {
   cc1000_header_t* getHeader(message_t* amsg) {
     return (cc1000_header_t*)(amsg->data - sizeof(cc1000_header_t));
   }
+
+  cc1000_footer_t *getFooter(message_t *amsg) {
+    return (cc1000_footer_t *)(amsg->footer);
+  }
   
   command error_t AMSend.send[am_id_t id](am_addr_t addr,
                                          message_t* amsg,
@@ -78,21 +82,40 @@ implementation {
     return call Packet.maxPayloadLength();
   }
 
-  command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
-    return call Packet.getPayload(m, len);
+  command void* AMSend.getPayload[am_id_t id](message_t* m) {
+    return call Packet.getPayload(m, NULL);
   }
 
   /* Receiving a packet */
 
   event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
-    if (call AMPacket.isForMe(msg)) {
-      return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);
-    }
-    else {
-      return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len);
+    cc1000_footer_t* msg_footer = getFooter(msg);
+    if(msg_footer->crc == 1) {      
+      if (call AMPacket.isForMe(msg)) {
+        return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);
+      }
+      else {
+        return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len);
+      }
     }
   }
   
+  command void* Receive.getPayload[am_id_t id](message_t* m, uint8_t* len) {
+    return call Packet.getPayload(m, len);
+  }
+
+  command uint8_t Receive.payloadLength[am_id_t id](message_t* m) {
+    return call Packet.payloadLength(m);
+  }
+  
+  command void* Snoop.getPayload[am_id_t id](message_t* m, uint8_t* len) {
+    return call Packet.getPayload(m, len);
+  }
+
+  command uint8_t Snoop.payloadLength[am_id_t id](message_t* m) {
+    return call Packet.payloadLength(m);
+  }
+
   command am_addr_t AMPacket.address() {
     return call amAddress();
   }

diff --git a/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc b/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
index 6ce93bad733ca3ffd9edd66ef66122b898dbd8c4..a84fe9cdd1611528183c32f792119d1d63e895b3 100644 (file)
--- a/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
@@ -54,6 +54,10 @@ implementation {
   cc1000_header_t* getHeader(message_t* amsg) {\r
     return (cc1000_header_t*)(amsg->data - sizeof(cc1000_header_t));\r
   }\r
+\r
+  cc1000_footer_t *getFooter(message_t *amsg) {\r
+    return (cc1000_footer_t *)(amsg->footer);\r
+  }\r
   \r
   command error_t AMSend.send[am_id_t id](am_addr_t addr,\r
                                          message_t* amsg,\r
@@ -85,11 +89,14 @@ implementation {
   /* Receiving a packet */\r
 \r
   event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {\r
-    if (call AMPacket.isForMe(msg)) {\r
-      return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);\r
-    }\r
-    else {\r
-      return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len);\r
+    cc1000_footer_t* msg_footer = getFooter(msg);\r
+    if(msg_footer->crc == 1) {      \r
+      if (call AMPacket.isForMe(msg)) {\r
+        return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);\r
+      }\r
+      else {\r
+        return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len);\r
+      }\r
     }\r
   }\r
   \r