Remove bogus 'tab:4' and 'tab:2' markers.

[tinyos-2.x.git] / tos / chips / cc1000 / CC1000ActiveMessageP.nc

diff --git a/tos/chips/cc1000/CC1000ActiveMessageP.nc b/tos/chips/cc1000/CC1000ActiveMessageP.nc
index 118c8a810fb8667f2a168a65d650c15f8c28a1a2..08adb2039e3b65e310a10b47751cd4ff1bb67470 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageP.nc
@@ -1,6 +1,6 @@
 // $Id$
 
-/*                                                                     tab:4
+/*
  * "Copyright (c) 2004-2005 The Regents of the University  of California.  
  * All rights reserved.
  *
@@ -51,8 +51,12 @@ module CC1000ActiveMessageP {
 }
 implementation {
 
-  cc1000_header_t* getHeader(message_t* amsg) {
-    return (cc1000_header_t*)(amsg->data - sizeof(cc1000_header_t));
+  cc1000_header_t* ONE getHeader(message_t* ONE amsg) {
+    return TCAST(cc1000_header_t* ONE, (uint8_t*)amsg + offsetof(message_t, 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,
@@ -85,12 +89,16 @@ implementation {
   /* 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);
+      }
     }
+    return msg;
   }
   
   command am_addr_t AMPacket.address() {