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

[Kevin Klues]

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

Modified Files:
	CC1000ActiveMessageP.nc 
Log Message:
oops....

Index: CC1000ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000ActiveMessageP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CC1000ActiveMessageP.nc	8 Dec 2007 00:32:45 -0000	1.7
--- CC1000ActiveMessageP.nc	11 Dec 2007 00:42:31 -0000	1.8
***************
*** 83,88 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
    }
  
--- 83,88 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }
  
***************
*** 91,95 ****
    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);
--- 91,95 ----
    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);
***************
*** 101,120 ****
    }
    
-   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();
--- 101,104 ----