[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/collection LinkEstimatorP.nc, 1.1.2.12, 1.1.2.13

[Omprakash Gnawali]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	LinkEstimatorP.nc 
Log Message:
use three bits instead of two bits in the linkest header flag to encode the number of footer entries

Index: LinkEstimatorP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/LinkEstimatorP.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** LinkEstimatorP.nc	4 Jun 2006 11:54:42 -0000	1.1.2.12
--- LinkEstimatorP.nc	4 Jun 2006 23:17:59 -0000	1.1.2.13
***************
*** 126,136 ****
    // Masks for the flag field in the link estimation header
    enum {
!     // use last two bits to keep track of
      // how many footer entries there are
!     NUM_ENTRIES_FLAG = 0x3,
      // set to 1 if linkestimator originated the
      // beacon because upper layer did not send
      // messages frequently enough
!     SELF_BEACON_FLAG = 0x4
    };
  
--- 126,136 ----
    // Masks for the flag field in the link estimation header
    enum {
!     // use last three bits to keep track of
      // how many footer entries there are
!     NUM_ENTRIES_FLAG = 0x7,
      // set to 1 if linkestimator originated the
      // beacon because upper layer did not send
      // messages frequently enough
!     SELF_BEACON_FLAG = 0x8
    };
  
***************
*** 141,147 ****
      nx_uint8_t seq;
      // Bits       Purpose
!     // 1,0        Number of footer entries
!     // 2          Was this packet generated by the link estimator?
!     // 3..7       Not used yet
      nx_uint8_t flags;
    } linkest_header_t;
--- 141,147 ----
      nx_uint8_t seq;
      // Bits       Purpose
!     // 2,1,0      Number of footer entries
!     // 3          Was this packet generated by the link estimator?
!     // 4..7       Not used yet
      nx_uint8_t flags;
    } linkest_header_t;