[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/vu/tos/platform/mica2 ClockTimeStampingM.nc, 1.3, 1.4

Brano Kusy kusyb at users.sourceforge.net
Thu Jul 6 07:14:22 PDT 2006


Update of /cvsroot/tinyos/tinyos-1.x/contrib/vu/tos/platform/mica2
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4984

Modified Files:
	ClockTimeStampingM.nc 
Log Message:
fixing stupid errors

Index: ClockTimeStampingM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/vu/tos/platform/mica2/ClockTimeStampingM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClockTimeStampingM.nc	4 Jul 2006 13:55:26 -0000	1.3
--- ClockTimeStampingM.nc	6 Jul 2006 14:14:20 -0000	1.4
***************
*** 61,66 ****
  	// the time stamp of the last received message
  	norace uint32_t receiveTime;
  
! 	command uint32_t TimeStamping.getStamp2()
  	{
  		uint32_t time = 0;
--- 61,69 ----
  	// the time stamp of the last received message
  	norace uint32_t receiveTime;
+ 	TOS_MsgPtr sendMsg = 0;
+ 	TOS_MsgPtr receiveMsg = 0;
  
! 
! 	command uint32_t TimeStamping.getStamp2(TOS_MsgPtr msg)
  	{
  		uint32_t time = 0;
***************
*** 99,103 ****
  #endif
  		receiveTime = stamp;
! 		receiveMsg = msg;
  	}
  
--- 102,106 ----
  #endif
  		receiveTime = stamp;
! 		receiveMsg = msgBuff;
  	}
  
***************
*** 115,122 ****
  #endif
  
- 	TOS_MsgPtr sendMsg = 0;
- 	TOS_MsgPtr receiveMsg = 0;
- 
- 
  	command result_t TimeStamping.addStamp2(TOS_MsgPtr msg, int8_t offset)
  	{
--- 118,121 ----
***************
*** 125,129 ****
  		{
  			sendStampOffset = offset;
! 			sendMsg = msg;
  			return SUCCESS;
  		}
--- 124,128 ----
  		{
  			sendStampOffset = offset;
! 			atomic sendMsg = msg;
  			return SUCCESS;
  		}



More information about the Tinyos-contrib-commits mailing list