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

[David Gay]

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

Modified Files:
	CC2420TransmitP.nc 
Log Message:
m_msg can be null (before first send)

Index: CC2420TransmitP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/transmit/CC2420TransmitP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC2420TransmitP.nc	17 Jun 2008 07:28:24 -0000	1.5
--- CC2420TransmitP.nc	20 Jun 2008 21:38:36 -0000	1.6
***************
*** 328,332 ****
          if ( time - m_prev_time < 10 ) {
            call CC2420Receive.sfd_dropped();
!           call PacketTimeStamp.clear(m_msg);
          }
          break;
--- 328,333 ----
          if ( time - m_prev_time < 10 ) {
            call CC2420Receive.sfd_dropped();
! 	  if (m_msg)
! 	    call PacketTimeStamp.clear(m_msg);
          }
          break;
***************
*** 356,360 ****
      uint8_t length;
  
!     if ( type == IEEE154_TYPE_ACK ) {
        ack_header = call CC2420PacketBody.getHeader( ack_msg );
        msg_header = call CC2420PacketBody.getHeader( m_msg );
--- 357,361 ----
      uint8_t length;
  
!     if ( type == IEEE154_TYPE_ACK && m_msg) {
        ack_header = call CC2420PacketBody.getHeader( ack_msg );
        msg_header = call CC2420PacketBody.getHeader( m_msg );