[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420/csma CC2420CsmaP.nc, 1.3, 1.4

[John Regehr]

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

Modified Files:
	CC2420CsmaP.nc 
Log Message:
safe tinyos annotations

Index: CC2420CsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/csma/CC2420CsmaP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CC2420CsmaP.nc	14 May 2008 21:33:07 -0000	1.3
--- CC2420CsmaP.nc	3 Jun 2008 04:43:02 -0000	1.4
***************
*** 64,68 ****
    };
  
!   message_t* m_msg;
    
    error_t sendErr = SUCCESS;
--- 64,68 ----
    };
  
!   message_t* ONE_NOK m_msg;
    
    error_t sendErr = SUCCESS;
***************
*** 157,161 ****
    command void* Send.getPayload(message_t* m, uint8_t len) {
      if (len <= call Send.maxPayloadLength()) {
!       return m->data;
      }
      else {
--- 157,161 ----
    command void* Send.getPayload(message_t* m, uint8_t len) {
      if (len <= call Send.maxPayloadLength()) {
!       return (void* COUNT_NOK(len))m->data;
      }
      else {