[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420ActiveMessageP.nc, 1.8, 1.9

[Phil Levis]

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

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


Index: CC2420ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420ActiveMessageP.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CC2420ActiveMessageP.nc	4 Jul 2007 00:37:14 -0000	1.8
--- CC2420ActiveMessageP.nc	13 Sep 2007 23:10:16 -0000	1.9
***************
*** 78,103 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
!   }
! 
!   /***************** Receive Commands ****************/
!   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);
!   }
!   
!   /***************** Snoop Commands ****************/
!   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);
-   }
- 
    /***************** AMPacket Commands ****************/
    command am_addr_t AMPacket.address() {
--- 78,85 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
      return call Packet.getPayload(m, len);
    }
  
    /***************** AMPacket Commands ****************/
    command am_addr_t AMPacket.address() {
***************
*** 170,178 ****
    }
    
!   command void* Packet.getPayload(message_t* msg, uint8_t* len) {
!     if (len != NULL) {
!       *len = call Packet.payloadLength(msg);
!     }
!     return msg->data;
    }
  
--- 152,157 ----
    }
    
!   command void* Packet.getPayload(message_t* msg, uint8_t len) {
!     return call SubSend.getPayload(msg, len);
    }