[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 LowPowerListeningLayerP.nc, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8316

Modified Files:
	LowPowerListeningLayerP.nc 
Log Message:
fix unsigned multiplication

Index: LowPowerListeningLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/LowPowerListeningLayerP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LowPowerListeningLayerP.nc	22 Apr 2008 10:55:20 -0000	1.2
--- LowPowerListeningLayerP.nc	22 Apr 2008 17:36:52 -0000	1.3
***************
*** 53,63 ****
  	{
  		// minimum wakeup time to catch a transmission in milliseconds
! 		LISTEN_WAKEUP = 6,	// use xxxL if LISTEN_WAKEUP * 10000 > 65535
  
  		// extra wakeup time after receiving a message in milliseconds
! 		AFTER_RECEIVE = 10,
  
  		// extra wakeup time after transmitting a message in milliseconds
! 		AFTER_TRANSMIT = 10,
  
  		MIN_SLEEP = 2,		// the minimum sleep interval in milliseconds
--- 53,63 ----
  	{
  		// minimum wakeup time to catch a transmission in milliseconds
! 		LISTEN_WAKEUP = 6U,	// use xxxL if LISTEN_WAKEUP * 10000 > 65535
  
  		// extra wakeup time after receiving a message in milliseconds
! 		AFTER_RECEIVE = 10U,
  
  		// extra wakeup time after transmitting a message in milliseconds
! 		AFTER_TRANSMIT = 10U,
  
  		MIN_SLEEP = 2,		// the minimum sleep interval in milliseconds
***************
*** 309,312 ****
--- 309,314 ----
  		txLen = len;
  		txError = FAIL;
+ 
+ 		return SUCCESS;
  	}
  
***************
*** 367,371 ****
  			return MAX_SLEEP;
  
! 		return ((10000 * LISTEN_WAKEUP) / dutyCycle) - LISTEN_WAKEUP;
  	}
  
--- 369,373 ----
  			return MAX_SLEEP;
  
! 		return ((10000U * LISTEN_WAKEUP) / dutyCycle) - LISTEN_WAKEUP;
  	}
  
***************
*** 377,381 ****
  			return MIN_DUTY;
  
! 		return (10000 * LISTEN_WAKEUP) / (LISTEN_WAKEUP + interval);
  	}
  
--- 379,383 ----
  			return MIN_DUTY;
  
! 		return (10000U * LISTEN_WAKEUP) / (LISTEN_WAKEUP + interval);
  	}