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

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CtpP.nc CtpRoutingEngineP.nc 
Log Message:
Timing constants.


Index: CtpP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** CtpP.nc	6 Sep 2006 20:14:30 -0000	1.1.2.2
--- CtpP.nc	10 Sep 2006 23:06:43 -0000	1.1.2.3
***************
*** 127,131 ****
    components new AMSnooperC(AM_CTP_DATA);
    
!   components new CtpRoutingEngineP(TREE_ROUTING_TABLE_SIZE) as Router;
    StdControl = Router;
    StdControl = Estimator;
--- 127,131 ----
    components new AMSnooperC(AM_CTP_DATA);
    
!   components new CtpRoutingEngineP(TREE_ROUTING_TABLE_SIZE, 2, 60) as Router;
    StdControl = Router;
    StdControl = Estimator;

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpRoutingEngineP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** CtpRoutingEngineP.nc	10 Sep 2006 23:01:15 -0000	1.1.2.3
--- CtpRoutingEngineP.nc	10 Sep 2006 23:06:43 -0000	1.1.2.4
***************
*** 158,163 ****
  
      void chooseAdvertiseTime() {
!        uint16_t t = call Random.random16() % (currentInterval / 2);
!        t += currentInterval;
         tHasPassed = FALSE;
         call BeaconTimer.stop();
--- 158,163 ----
  
      void chooseAdvertiseTime() {
!        uint32_t t = currentInterval * 512; // * 1024 / 2
!        t += call Random.random32() % t;
         tHasPassed = FALSE;
         call BeaconTimer.stop();
***************
*** 179,184 ****
  
      void remainingInterval() {
!        uint16_t t = call BeaconTimer.getdt();
!        t = currentInterval - t;
         tHasPassed = TRUE;
         call BeaconTimer.start(t);
--- 179,183 ----
  
      void remainingInterval() {
!        uint32_t t = (currentInterval * 1024) - call BeaconTimer.getdt();
         tHasPassed = TRUE;
         call BeaconTimer.start(t);