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

[Phil Levis]

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

Modified Files:
	CC1000ActiveMessageP.nc CC1000SendReceiveP.nc 
Log Message:
The big interface switchover for Packet, Send, Receive, and AMSend.


Index: CC1000ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000ActiveMessageP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC1000ActiveMessageP.nc	20 Jun 2007 23:49:02 -0000	1.5
--- CC1000ActiveMessageP.nc	13 Sep 2007 23:10:14 -0000	1.6
***************
*** 79,84 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
    }
  
--- 79,84 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }
  
***************
*** 94,113 ****
    }
    
-   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();
--- 94,97 ----

Index: CC1000SendReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000SendReceiveP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC1000SendReceiveP.nc	12 Dec 2006 18:23:05 -0000	1.5
--- CC1000SendReceiveP.nc	13 Sep 2007 23:10:16 -0000	1.6
***************
*** 633,643 ****
    }
  
!   command void* Packet.getPayload(message_t *msg, uint8_t *len) {
!     if (len != NULL) {
!       cc1000_header_t *header = getHeader(msg);
! 
!       *len = header->length;
      }
-     return (void*)msg->data;
    }
  
--- 633,643 ----
    }
  
!   command void* Packet.getPayload(message_t *msg, uint8_t len) {
!     if (len <= TOSH_DATA_LENGTH) {
!       return (void*)msg->data;
!     }
!     else {
!       return NULL;
      }
    }
  
***************
*** 650,667 ****
    }
  
-   command void* Receive.getPayload(message_t *m, uint8_t *len) {
-     return call Packet.getPayload(m, len);
-   }
- 
-   command uint8_t Receive.payloadLength(message_t *m) {
-     return call Packet.payloadLength(m);
-   }
- 
    command uint8_t Send.maxPayloadLength() {
      return call Packet.maxPayloadLength();
    }
  
!   command void* Send.getPayload(message_t *m) {
!     return call Packet.getPayload(m, NULL);
    }
  
--- 650,659 ----
    }
  
    command uint8_t Send.maxPayloadLength() {
      return call Packet.maxPayloadLength();
    }
  
!   command void* Send.getPayload(message_t *m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }