[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain Drain.nc, 1.1, 1.2 DrainLinkEstM.nc, 1.14, 1.15

[Gilman Tolle]

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

Modified Files:
	Drain.nc DrainLinkEstM.nc 
Log Message:
Exported a function needed for Drain nodes to build trees of a specific instance.

Index: Drain.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/Drain.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Drain.nc	10 Jun 2005 19:38:03 -0000	1.1
--- Drain.nc	13 Jun 2005 22:07:05 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  interface Drain {
    command result_t buildTree();
+   command result_t buildTreeInstance(uint8_t instance);
  }

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DrainLinkEstM.nc	10 Jun 2005 19:38:03 -0000	1.14
--- DrainLinkEstM.nc	13 Jun 2005 22:07:05 -0000	1.15
***************
*** 218,221 ****
--- 218,225 ----
  
    command result_t Drain.buildTree() {
+     return call Drain.buildTreeInstance(call Random.rand() & 0xFF);
+   }
+ 
+   command result_t Drain.buildTreeInstance(uint8_t instance) {
  
      DrainRouteEntry* route = newRoute(TOS_LOCAL_ADDRESS);
***************
*** 224,228 ****
        return FAIL;
  
!     route->treeInstance = call Random.rand() & 0xFF;
  
      dbg(DBG_ROUTE, "DrainLinkEstM: buildTree(instance=%d)\n",
--- 228,232 ----
        return FAIL;
  
!     route->treeInstance = instance;
  
      dbg(DBG_ROUTE, "DrainLinkEstM: buildTree(instance=%d)\n",