[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/le LinkEstimator.h, 1.1.2.3, 1.1.2.4 LinkEstimatorP.nc, 1.1.2.8, 1.1.2.9

[Omprakash Gnawali]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	LinkEstimator.h LinkEstimatorP.nc 
Log Message:
removed unused variables

Index: LinkEstimator.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le/Attic/LinkEstimator.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** LinkEstimator.h	28 Oct 2006 20:13:46 -0000	1.1.2.3
--- LinkEstimator.h	1 Nov 2006 20:55:30 -0000	1.1.2.4
***************
*** 34,41 ****
  // Number of entries in the neighbor table
  #define NEIGHBOR_TABLE_SIZE 10
- // Timer that determines how often beacons should be
- // sent and link estimate updated
- #define LINKEST_TIMER_RATE 4096
- 
  
  // Masks for the flag field in the link estimation header
--- 34,37 ----
***************
*** 76,81 ****
  enum {
    VALID_ENTRY = 0x1, 
!   // A link becomes mature after
!   // TABLEUPDATE_INTERVAL*LINKEST_TIMER_RATE
    MATURE_ENTRY = 0x2,
    // Flag to indicate that this link has received the
--- 72,77 ----
  enum {
    VALID_ENTRY = 0x1, 
!   // A link becomes mature after BLQ_PKT_WINDOW
!   // packets are received and an estimate is compute
    MATURE_ENTRY = 0x2,
    // Flag to indicate that this link has received the

Index: LinkEstimatorP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le/Attic/LinkEstimatorP.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** LinkEstimatorP.nc	1 Nov 2006 02:21:50 -0000	1.1.2.8
--- LinkEstimatorP.nc	1 Nov 2006 20:55:30 -0000	1.1.2.9
***************
*** 69,78 ****
      INVALID_NEIGHBOR_ADDR = 0xff,
      INFINITY = 0xff,
-     // update the link estimate this often
-     TABLEUPDATE_INTERVAL = 48,
-     // send a beacon this often unless user of
-     // this component is sending a beacon atleast
-     // at this rate
-     BEACON_INTERVAL = 16,
      // decay the link estimate using this alpha
      // we use a denominator of 10, so this corresponds to 0.2
--- 69,72 ----
***************
*** 101,108 ****
    // for previous send is flagged.
    bool beaconBusy = FALSE;
-   // we update the quality estimate when curEstInterval == TABLEUPDATE_INTERVAL
-   uint8_t curEstInterval = 0;
-   // we send out beacon if curBeaconInterval == BEACON_INTERVAL
-   uint8_t curBeaconInterval = 0;
    // if there is not enough room in the packet to put all the neighbor table
    // entries, in order to do round robin we need to remember which entry
--- 95,98 ----
***************
*** 609,614 ****
    command error_t Send.send(am_addr_t addr, message_t* msg, uint8_t len) {
      uint8_t newlen;
- 
-     curBeaconInterval = 0;
      newlen = addLinkEstHeaderAndFooter(msg, len);
      dbg("LITest", "%s packet of length %hhu became %hhu\n", __FUNCTION__, len, newlen);
--- 599,602 ----