[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc1000 CC1000ActiveMessageP.nc, 1.6, 1.7

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4892/cc1000

Modified Files:
	CC1000ActiveMessageP.nc 
Log Message:
Fix stupid crc bug

Index: CC1000ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000ActiveMessageP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CC1000ActiveMessageP.nc	13 Sep 2007 23:10:14 -0000	1.6
--- CC1000ActiveMessageP.nc	8 Dec 2007 00:32:45 -0000	1.7
***************
*** 55,58 ****
--- 55,62 ----
      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,
***************
*** 79,84 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }
  
--- 83,88 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
    }
  
***************
*** 86,97 ****
  
    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);
      }
    }
    
    command am_addr_t AMPacket.address() {
      return call amAddress();
--- 90,120 ----
  
    event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t 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();