[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420/transmit CC2420TransmitP.nc, 1.2, 1.3

[John Regehr]

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

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

Index: CC2420TransmitP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/transmit/CC2420TransmitP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420TransmitP.nc	28 Sep 2007 17:53:58 -0000	1.2
--- CC2420TransmitP.nc	3 Jun 2008 04:43:03 -0000	1.3
***************
*** 1,4 ****
! /*
!  * Copyright (c) 2005-2006 Arch Rock Corporation
   * All rights reserved.
   *
--- 1,4 ----
! /* 
!  * Copyright (c) 2005-2006 Arch Rock Corporation 
   * All rights reserved.
   *
***************
*** 96,100 ****
    };
    
!   norace message_t *m_msg;
    
    norace bool m_cca;
--- 96,100 ----
    };
    
!   norace message_t * ONE_NOK m_msg;
    
    norace bool m_cca;
***************
*** 125,129 ****
  
    /***************** Prototypes ****************/
!   error_t send( message_t *p_msg, bool cca );
    error_t resend( bool cca );
    void loadTXFIFO();
--- 125,129 ----
  
    /***************** Prototypes ****************/
!   error_t send( message_t * ONE p_msg, bool cca );
    error_t resend( bool cca );
    void loadTXFIFO();
***************
*** 168,172 ****
  
    /**************** Send Commands ****************/
!   async command error_t Send.send( message_t* p_msg, bool useCca ) {
      return send( p_msg, useCca );
    }
--- 168,172 ----
  
    /**************** Send Commands ****************/
!   async command error_t Send.send( message_t* ONE p_msg, bool useCca ) {
      return send( p_msg, useCca );
    }
***************
*** 489,493 ****
     * @param cca TRUE if this transmit should use clear channel assessment
     */
!   error_t send( message_t* p_msg, bool cca ) {
      atomic {
        if (m_state == S_CANCEL) {
--- 489,493 ----
     * @param cca TRUE if this transmit should use clear channel assessment
     */
!   error_t send( message_t* ONE p_msg, bool cca ) {
      atomic {
        if (m_state == S_CANCEL) {
***************
*** 655,659 ****
      m_tx_power = tx_power;
      
!     call TXFIFO.write( (uint8_t*)header, header->length - 1);
    }
    
--- 655,662 ----
      m_tx_power = tx_power;
      
!     {
!       uint8_t tmpLen = header->length - 1;
!       call TXFIFO.write(TCAST(uint8_t * COUNT(tmpLen), header), header->length - 1);
!     }
    }