[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim CpmModelC.nc, 1.10, 1.11

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7828

Modified Files:
	CpmModelC.nc 
Log Message:
Acks should still work if a node sets its AM address.


Index: CpmModelC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/CpmModelC.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CpmModelC.nc	4 Sep 2007 17:19:22 -0000	1.10
--- CpmModelC.nc	5 Feb 2009 22:45:41 -0000	1.11
***************
*** 427,431 ****
      while (neighborEntry != NULL) {
        int other = neighborEntry->mote;
!       sim_gain_put(other, msg, endTime, ack && (other == dest), power + sim_gain_value(sim_node(), other), reversePower + sim_gain_value(other, sim_node()));
        neighborEntry = sim_gain_next(neighborEntry);
      }
--- 427,431 ----
      while (neighborEntry != NULL) {
        int other = neighborEntry->mote;
!       sim_gain_put(other, msg, endTime, ack, power + sim_gain_value(sim_node(), other), reversePower + sim_gain_value(other, sim_node()));
        neighborEntry = sim_gain_next(neighborEntry);
      }