[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpRoutingEngineP.nc, 1.1.2.4, 1.1.2.5

[Kyle Jamieson]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24540/tos/lib/net/ctp

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CtpRoutingEngineP.nc 
Log Message:
More compile-fixes to CTP.

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpRoutingEngineP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** CtpRoutingEngineP.nc	10 Sep 2006 23:06:43 -0000	1.1.2.4
--- CtpRoutingEngineP.nc	11 Sep 2006 12:17:07 -0000	1.1.2.5
***************
*** 159,166 ****
      void chooseAdvertiseTime() {
         uint32_t t = currentInterval * 512; // * 1024 / 2
!        t += call Random.random32() % t;
         tHasPassed = FALSE;
         call BeaconTimer.stop();
!        call BeaconTimer.start(t);
      }
  
--- 159,166 ----
      void chooseAdvertiseTime() {
         uint32_t t = currentInterval * 512; // * 1024 / 2
!        t += call Random.rand32() % t;
         tHasPassed = FALSE;
         call BeaconTimer.stop();
!        call BeaconTimer.startPeriodic(t);
      }
  
***************
*** 181,185 ****
         uint32_t t = (currentInterval * 1024) - call BeaconTimer.getdt();
         tHasPassed = TRUE;
!        call BeaconTimer.start(t);
      }
  
--- 181,185 ----
         uint32_t t = (currentInterval * 1024) - call BeaconTimer.getdt();
         tHasPassed = TRUE;
!        call BeaconTimer.startPeriodic(t);
      }
  
***************
*** 399,403 ****
      event void BeaconTimer.fired() {
        if (radioOn && running) {
!         if (!t.hasPassed()) {
            post updateRouteTask();
            post sendBeaconTask();
--- 399,403 ----
      event void BeaconTimer.fired() {
        if (radioOn && running) {
!         if (!tHasPassed) {
            post updateRouteTask();
            post sendBeaconTask();
***************
*** 407,410 ****
--- 407,411 ----
            decayInterval();
          }
+       }
      }