[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/ptII/ptinyos/tos/types dbg.h, 1.1, 1.2

[Elaine Cheong]

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

Modified Files:
	dbg.h 
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: dbg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tos/types/dbg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dbg.h	19 Apr 2005 01:22:56 -0000	1.1
--- dbg.h	10 Nov 2006 03:36:28 -0000	1.2
***************
*** 109,113 ****
      if (! dbg_suppress_stdout) {
        // XXX MDW - used to be vprintf
!       fprintf(stdout, "%i: ", NODE_NUM);
        vfprintf(stdout, format, args);
        //va_end(args);
--- 109,116 ----
      if (! dbg_suppress_stdout) {
        // XXX MDW - used to be vprintf
!       // Viptos: _PTII_NODEID is passed to the preprocessor as a macro definition.
!       // Viptos: We assume that there is only one node per TOSSIM.
!       //fprintf(stdout, "%i: ", NODE_NUM);
!       fprintf(stdout, "%i: ", _PTII_NODEID);
        vfprintf(stdout, format, args);
        //va_end(args);
***************
*** 126,130 ****
          
          // Call JNI wrapper with NODE_NUM.
!         ptII_dbg(mode, ptII_ev.debugMessage, NODE_NUM, TRUE);
      }
    }    
--- 129,136 ----
          
          // Call JNI wrapper with NODE_NUM.
!         // Viptos: _PTII_NODEID is passed to the preprocessor as a macro definition.
!         // Viptos: We assume that there is only one node per TOSSIM.
!         //ptII_dbg(mode, ptII_ev.debugMessage, NODE_NUM, TRUE);
!         ptII_dbg(mode, ptII_ev.debugMessage, _PTII_NODEID, TRUE);
      }
    }