[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/le LinkEstimatorP.nc, 1.1.2.9, 1.1.2.10

[Omprakash Gnawali]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	LinkEstimatorP.nc 
Log Message:
remove unused code related to linkestimator generating its own traffic

Index: LinkEstimatorP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le/Attic/LinkEstimatorP.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** LinkEstimatorP.nc	1 Nov 2006 20:55:30 -0000	1.1.2.9
--- LinkEstimatorP.nc	1 Nov 2006 21:40:36 -0000	1.1.2.10
***************
*** 48,53 ****
      interface Packet as SubPacket;
      interface Receive as SubReceive;
-     interface AMSend as AMSendLinkEst;
-     interface Receive as ReceiveLinkEst;
    }
  }
--- 48,51 ----
***************
*** 438,462 ****
    }
  
-   // originate the beacon by the link estimator
-   // this happens only if the user of this
-   // component did not send an outgoing message
-   // fast enough (at least once every BEACON_INTERVAL)
-   task void sendLinkEstBeacon() {
-     uint8_t newlen;
-     linkest_header_t *hdr;
-     if (!beaconBusy) {
-       newlen = addLinkEstHeaderAndFooter(&linkEstPkt, 0);
- 
-       hdr = getHeader(&linkEstPkt);
-       dbg("LI", "Sending seq because noone sent: %d\n", linkEstSeq);
-       print_packet(&linkEstPkt, newlen);
- 
-       if (call AMSendLinkEst.send(AM_BROADCAST_ADDR, &linkEstPkt, newlen) == SUCCESS) {
- 	beaconBusy = TRUE;
-       }
-     }
-   }
- 
- 
    // return bi-directional link quality to the neighbor
    command uint8_t LinkEstimator.getLinkQuality(am_addr_t neighbor) {
--- 436,439 ----
***************
*** 606,615 ****
    }
  
-   // done sending the linkestimation beacone originated
-   // by the estimator.
-   event void AMSendLinkEst.sendDone(message_t *msg, error_t error) {
-     beaconBusy = FALSE;
-   }
- 
    // done sending the message that originated by
    // the user of this component
--- 583,586 ----
***************
*** 631,636 ****
    }
  
- 
- 
    // called when link estimator generator packet or
    // packets from upper layer that are wired to pass through
--- 602,605 ----
***************
*** 729,742 ****
    }
  
-   // handler for packets that were generated by the link estimator
-   event message_t* ReceiveLinkEst.receive(message_t* msg,
- 					  void* payload,
- 					  uint8_t len) {
-     dbg("LI", "Received self packet. Will not signal up\n");
-     processReceivedMessage(msg, payload, len);
-     return msg;
-   }
- 
- 
    command void* Receive.getPayload(message_t* msg, uint8_t* len) {
      return call Packet.getPayload(msg, len);
--- 698,701 ----