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

[Omprakash Gnawali]

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

Modified Files:
	CtpRoutingEngineP.nc 
Log Message:
lqi no longer wired to the routing engine

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpRoutingEngineP.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CtpRoutingEngineP.nc	21 Sep 2007 23:50:28 -0000	1.9
--- CtpRoutingEngineP.nc	24 Sep 2007 14:01:22 -0000	1.10
***************
*** 469,473 ****
          ctp_routing_header_t* rcvBeacon;
          bool congested;
-         uint8_t lqi = call CC2420Packet.getLqi(msg);
  
          // Received a beacon, but it's not from us.
--- 469,472 ----
***************
*** 490,494 ****
              __FUNCTION__, from, 
              rcvBeacon->parent, rcvBeacon->etx);
-         call CollectionDebug.logEventRoute(NET_C_TREE_RCV_BEACON, from, lqi, rcvBeacon->etx);
  
          //update neighbor table
--- 489,492 ----
***************
*** 516,524 ****
  
  
-   //event void LinkEstimator.newNeighbor(am_addr_t neighbor, uint8_t lqi) {
-   //  call CollectionDebug.logEventRoute(NET_C_TREE_RCV_BEACON, neighbor, lqi, 0);
-   //}
- 
- 
      /* Signals that a neighbor is no longer reachable. need special care if
       * that neighbor is our parent */
--- 514,517 ----