[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/4bitle LinkEstimatorP.nc, 1.6, 1.7

[John Regehr]

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

Modified Files:
	LinkEstimatorP.nc 
Log Message:
few more safe tinyos annotations

Index: LinkEstimatorP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/4bitle/LinkEstimatorP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LinkEstimatorP.nc	22 Jan 2008 18:03:40 -0000	1.6
--- LinkEstimatorP.nc	4 Jun 2008 05:45:20 -0000	1.7
***************
*** 111,116 ****
    uint8_t addLinkEstHeaderAndFooter(message_t *msg, uint8_t len) {
      uint8_t newlen;
!     linkest_header_t *hdr;
!     linkest_footer_t *footer;
      uint8_t i, j, k;
      uint8_t maxEntries, newPrevSentIdx;
--- 111,116 ----
    uint8_t addLinkEstHeaderAndFooter(message_t *msg, uint8_t len) {
      uint8_t newlen;
!     linkest_header_t * ONE hdr;
!     linkest_footer_t * ONE footer;
      uint8_t i, j, k;
      uint8_t maxEntries, newPrevSentIdx;
***************
*** 132,143 ****
      newPrevSentIdx = 0;
      for (i = 0; i < NEIGHBOR_TABLE_SIZE && j < maxEntries; i++) {
        k = (prevSentIdx + i + 1) % NEIGHBOR_TABLE_SIZE;
        if ((NeighborTable[k].flags & VALID_ENTRY) &&
  	  (NeighborTable[k].flags & MATURE_ENTRY)) {
! 	footer->neighborList[j].ll_addr = NeighborTable[k].ll_addr;
! 	footer->neighborList[j].inquality = NeighborTable[k].inquality;
  	newPrevSentIdx = k;
! 	dbg("LI", "Loaded on footer: %d %d %d\n", j, footer->neighborList[j].ll_addr,
! 	    footer->neighborList[j].inquality);
  	j++;
        }
--- 132,151 ----
      newPrevSentIdx = 0;
      for (i = 0; i < NEIGHBOR_TABLE_SIZE && j < maxEntries; i++) {
+       uint8_t neighborCount;
+       neighbor_stat_entry_t * COUNT(neighborCount) neighborLists;
+       if(maxEntries <= NEIGHBOR_TABLE_SIZE)
+         neighborCount = maxEntries;
+       else
+         neighborCount = NEIGHBOR_TABLE_SIZE;
+       
+       neighborLists = TCAST(neighbor_stat_entry_t * COUNT(neighborCount), footer->neighborList);
        k = (prevSentIdx + i + 1) % NEIGHBOR_TABLE_SIZE;
        if ((NeighborTable[k].flags & VALID_ENTRY) &&
  	  (NeighborTable[k].flags & MATURE_ENTRY)) {
! 	neighborLists[j].ll_addr = NeighborTable[k].ll_addr;
! 	neighborLists[j].inquality = NeighborTable[k].inquality;
  	newPrevSentIdx = k;
! 	dbg("LI", "Loaded on footer: %d %d %d\n", j, neighborLists[j].ll_addr,
! 	    neighborLists[j].inquality);
  	j++;
        }
***************
*** 586,590 ****
    // packets from upper layer that are wired to pass through
    // link estimator is received
!   void processReceivedMessage(message_t* msg, void* payload, uint8_t len) {
      uint8_t nidx;
      uint8_t num_entries;
--- 594,598 ----
    // packets from upper layer that are wired to pass through
    // link estimator is received
!   void processReceivedMessage(message_t* ONE msg, void* COUNT_NOK(len) payload, uint8_t len) {
      uint8_t nidx;
      uint8_t num_entries;