[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim TossimPacketModelC.nc, 1.7, 1.8

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32377

Modified Files:
	TossimPacketModelC.nc 
Log Message:
Pass state properly when radio is turned off in middle of tranmission.


Index: TossimPacketModelC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/TossimPacketModelC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TossimPacketModelC.nc	15 Jun 2007 00:45:18 -0000	1.7
--- TossimPacketModelC.nc	19 Feb 2008 19:51:08 -0000	1.8
***************
*** 134,138 ****
      return meta->ack;
    }
! 
    task void sendDoneTask() {
      message_t* msg = sending;
--- 134,138 ----
      return meta->ack;
    }
!       
    task void sendDoneTask() {
      message_t* msg = sending;
***************
*** 142,146 ****
      meta->time = 0;
      sending = FALSE;
!     signal Packet.sendDone(msg, SUCCESS);
    }
  
--- 142,146 ----
      meta->time = 0;
      sending = FALSE;
!     signal Packet.sendDone(msg, running? SUCCESS:EOFF);
    }
  
***************
*** 245,249 ****
      sim_time_t duration;
      tossim_metadata_t* metadata = getMetadata(sending);
!     
      duration = 8 * (sendingLength + sim_packet_header_length());
      duration /= sim_csma_bits_per_symbol();
--- 245,249 ----
      sim_time_t duration;
      tossim_metadata_t* metadata = getMetadata(sending);
! 
      duration = 8 * (sendingLength + sim_packet_header_length());
      duration /= sim_csma_bits_per_symbol();
***************
*** 274,278 ****
      transmitting = FALSE;
      dbg("TossimPacketModelC", "PACKET: Signaling send done at %llu.\n", sim_time());
!     signal Packet.sendDone(rval, SUCCESS);
    }
  
--- 274,278 ----
      transmitting = FALSE;
      dbg("TossimPacketModelC", "PACKET: Signaling send done at %llu.\n", sim_time());
!     signal Packet.sendDone(rval, running? SUCCESS:EOFF);
    }