[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain DrainLinkEstM.nc, 1.17, 1.18

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24248

Modified Files:
	DrainLinkEstM.nc 
Log Message:
Changed the DrainNextHop attributes to Lists, because we can now have more than one route. Changed the Drain tool to support runtime selection of whether we're building a default tree (that takes messages addressed to 0) or just a regular tree (that takes messages addressed to the specific root node, or MOTEID address of the TOSBase).

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DrainLinkEstM.nc	16 Jun 2005 17:46:30 -0000	1.17
--- DrainLinkEstM.nc	8 Jul 2005 21:04:43 -0000	1.18
***************
*** 37,43 ****
      interface RouteControl;
  
!     interface Attr<uint16_t> as DrainNextHop @nucleusAttr("DrainNextHop");
!     interface Attr<uint16_t> as DrainNextHopCost @nucleusAttr("DrainNextHopCost");
!     interface Attr<uint16_t> as DrainNextHopLinkEst @nucleusAttr("DrainNextHopLinkEst");
    }
  
--- 37,43 ----
      interface RouteControl;
  
!     interface AttrList<uint16_t> as DrainNextHop @nucleusAttr("DrainNextHop");
!     interface AttrList<uint16_t> as DrainNextHopCost @nucleusAttr("DrainNextHopCost");
!     interface AttrList<uint16_t> as DrainNextHopLinkEst @nucleusAttr("DrainNextHopLinkEst");
    }
  
***************
*** 513,530 ****
    }
  
!   command result_t DrainNextHop.get(uint16_t* buf) {
!     memcpy(buf, &routes[0].nextHop, sizeof(uint16_t));
      signal DrainNextHop.getDone(buf);
      return SUCCESS;
    }
  
!   command result_t DrainNextHopCost.get(uint16_t* buf) {
!     memcpy(buf, &routes[0].nextHopCost, sizeof(uint16_t));
      signal DrainNextHopCost.getDone(buf);
      return SUCCESS;
    }
  
!   command result_t DrainNextHopLinkEst.get(uint16_t* buf) {
!     memcpy(buf, &routes[0].nextHopLinkEst, sizeof(uint16_t));
      signal DrainNextHopLinkEst.getDone(buf);
      return SUCCESS;
--- 513,539 ----
    }
  
!   command result_t DrainNextHop.get(uint16_t* buf, uint8_t idx) {
!     if (idx >= DRAIN_MAX_ROUTES) {
!       return FAIL;
!     }
!     memcpy(buf, &routes[idx].nextHop, sizeof(uint16_t));
      signal DrainNextHop.getDone(buf);
      return SUCCESS;
    }
  
!   command result_t DrainNextHopCost.get(uint16_t* buf, uint8_t idx) {
!     if (idx >= DRAIN_MAX_ROUTES) {
!       return FAIL;
!     }
!     memcpy(buf, &routes[idx].nextHopCost, sizeof(uint16_t));
      signal DrainNextHopCost.getDone(buf);
      return SUCCESS;
    }
  
!   command result_t DrainNextHopLinkEst.get(uint16_t* buf, uint8_t idx) {
!     if (idx >= DRAIN_MAX_ROUTES) {
!       return FAIL;
!     }
!     memcpy(buf, &routes[idx].nextHopLinkEst, sizeof(uint16_t));
      signal DrainNextHopLinkEst.getDone(buf);
      return SUCCESS;