[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/ptII/ptinyos/beta/TOSSIM-packet Nido.nc, 1.4, 1.5

[Elaine Cheong]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/beta/TOSSIM-packet
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31528/beta/TOSSIM-packet

Modified Files:
	Nido.nc 
Log Message:
Fixed some debug output statements to use _PTII_NODEID.  Not possible to fix
all of them, since some output statements do not use NODE_NUM, and get the
node id from a data structure instead.



Index: Nido.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/beta/TOSSIM-packet/Nido.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Nido.nc	1 Feb 2006 07:50:12 -0000	1.4
--- Nido.nc	10 Nov 2006 03:36:28 -0000	1.5
***************
*** 342,347 ****
  
        tos_state.node_state[i].time = start_time;
        dbg_clear(DBG_SIM|DBG_USR3, "SIM: Time for mote %lli initialized to %lli.\n",
!                 i, tos_state.node_state[i].time);
      }
  
--- 342,351 ----
  
        tos_state.node_state[i].time = start_time;
+       // Viptos: _PTII_NODEID is passed to the preprocessor as a macro definition.
+       // Viptos: We assume that there is only one node per TOSSIM.
+       //dbg_clear(DBG_SIM|DBG_USR3, "SIM: Time for mote %lli initialized to %lli.\n",
        dbg_clear(DBG_SIM|DBG_USR3, "SIM: Time for mote %lli initialized to %lli.\n",
!       //          i, tos_state.node_state[i].time);
!               _PTII_NODEID, tos_state.node_state[i].time);
      }