[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/le LinkEstimator.h,
1.1.2.5, 1.1.2.6 LinkEstimatorP.nc, 1.1.2.11, 1.1.2.12
Omprakash Gnawali
gnawali at users.sourceforge.net
Fri Nov 3 01:30:09 PST 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19579
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
LinkEstimator.h LinkEstimatorP.nc
Log Message:
typos
Index: LinkEstimator.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/le/Attic/LinkEstimator.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** LinkEstimator.h 1 Nov 2006 21:43:30 -0000 1.1.2.5
--- LinkEstimator.h 3 Nov 2006 09:30:07 -0000 1.1.2.6
***************
*** 48,52 ****
// link estimator header added to
! // every message passing thru' the link estimator
typedef nx_struct linkest_header {
nx_uint8_t flags;
--- 48,52 ----
// link estimator header added to
! // every message passing through the link estimator
typedef nx_struct linkest_header {
nx_uint8_t flags;
***************
*** 72,76 ****
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
--- 72,76 ----
VALID_ENTRY = 0x1,
// A link becomes mature after BLQ_PKT_WINDOW
! // packets are received and an estimate is computed
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.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** LinkEstimatorP.nc 1 Nov 2006 21:43:30 -0000 1.1.2.11
--- LinkEstimatorP.nc 3 Nov 2006 09:30:07 -0000 1.1.2.12
***************
*** 84,88 ****
// keep information about links from the neighbors
neighbor_table_entry_t NeighborTable[NEIGHBOR_TABLE_SIZE];
! // link estiamtion sequence, increment every time a beacon is sent
uint8_t linkEstSeq = 0;
// if there is not enough room in the packet to put all the neighbor table
--- 84,88 ----
// keep information about links from the neighbors
neighbor_table_entry_t NeighborTable[NEIGHBOR_TABLE_SIZE];
! // link estimation sequence, increment every time a beacon is sent
uint8_t linkEstSeq = 0;
// if there is not enough room in the packet to put all the neighbor table
***************
*** 248,252 ****
if (ne->data_success == 0) {
// if there were no successful packet transmission in the
! // last window, assign a large eetx estimate
estETX = LARGE_EETX_VALUE;
} else {
--- 248,252 ----
if (ne->data_success == 0) {
// if there were no successful packet transmission in the
! // last window, assign a large EETX estimate
estETX = LARGE_EETX_VALUE;
} else {
***************
*** 491,495 ****
}
! // pin a neighbor so that it does not get evicted */
command error_t LinkEstimator.pinNeighbor(am_addr_t neighbor) {
uint8_t nidx = findIdx(neighbor);
--- 491,495 ----
}
! // pin a neighbor so that it does not get evicted
command error_t LinkEstimator.pinNeighbor(am_addr_t neighbor) {
uint8_t nidx = findIdx(neighbor);
***************
*** 546,550 ****
}
! /* called when the parent changes; clear state about data-driven link quality */
command error_t LinkEstimator.clearDLQ(am_addr_t neighbor) {
neighbor_table_entry_t *ne;
--- 546,550 ----
}
! // called when the parent changes; clear state about data-driven link quality
command error_t LinkEstimator.clearDLQ(am_addr_t neighbor) {
neighbor_table_entry_t *ne;
***************
*** 582,586 ****
}
! // cascade the send call down if (call Packet.payloadLength
command uint8_t Send.cancel(message_t* msg) {
return call AMSend.cancel(msg);
--- 582,586 ----
}
! // cascade the calls down
command uint8_t Send.cancel(message_t* msg) {
return call AMSend.cancel(msg);
***************
*** 630,634 ****
// evict the neighbor and init the entry
// else
! // we can not accomodate this neighbor in the table
nidx = findIdx(ll_addr);
if (nidx != INVALID_RVAL) {
--- 630,634 ----
// evict the neighbor and init the entry
// else
! // we can not accommodate this neighbor in the table
nidx = findIdx(ll_addr);
if (nidx != INVALID_RVAL) {
More information about the Tinyos-2-commits
mailing list