[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpInfo.nc, 1.4, 1.5 CtpRoutingEngineP.nc, 1.11, 1.12

[Omprakash Gnawali]

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

Modified Files:
	CtpInfo.nc CtpRoutingEngineP.nc 
Log Message:
get etx now returns etx for the path to the root instead of etx from the current parent to the root

Index: CtpInfo.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpInfo.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CtpInfo.nc	12 Dec 2006 18:23:29 -0000	1.4
--- CtpInfo.nc	31 Oct 2007 22:53:01 -0000	1.5
***************
*** 46,50 ****
     * caller.  If the parent is invalid, return FAIL (no info).  The
     * caller MUST NOT use the value in parent if the return is not
!    * SUCCESS.
     */
    
--- 46,50 ----
     * caller.  If the parent is invalid, return FAIL (no info).  The
     * caller MUST NOT use the value in parent if the return is not
!    * SUCCESS. Calling getEtx at the root will set the etx argument to 0.
     */
    

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpRoutingEngineP.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CtpRoutingEngineP.nc	24 Sep 2007 17:00:18 -0000	1.11
--- CtpRoutingEngineP.nc	31 Oct 2007 22:53:01 -0000	1.12
***************
*** 549,553 ****
          if (routeInfo.parent == INVALID_ADDR)    
              return FAIL;
!         *etx = routeInfo.etx;
          return SUCCESS;
      }
--- 549,558 ----
          if (routeInfo.parent == INVALID_ADDR)    
              return FAIL;
! 	if (state_is_root == 1) {
! 	  *etx = 0;
! 	} else {
! 	  // path etx = etx(parent) + etx(link to the parent)
! 	  *etx = routeInfo.etx + evaluateEtx(call LinkEstimator.getLinkQuality(routeInfo.parent));
! 	}
          return SUCCESS;
      }