[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain DrainC.nc, 1.9, 1.10 DrainLinkEstM.nc, 1.12, 1.13

[Gilman Tolle]

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

Modified Files:
	DrainC.nc DrainLinkEstM.nc 
Log Message:
Added the RouteControl interface to DrainC. Only getParent() and getDepth() are implemented.

Index: DrainC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainC.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DrainC.nc	4 May 2005 21:20:04 -0000	1.9
--- DrainC.nc	8 Jun 2005 18:39:13 -0000	1.10
***************
*** 62,65 ****
--- 62,67 ----
      interface StdControl;
  
+     interface RouteControl;
+ 
      interface SendMsg[uint8_t id];
      interface Send[uint8_t id];
***************
*** 94,98 ****
    Intercept = DrainM.Intercept;
    Snoop = DrainM.Snoop;
!   
    DrainM.SubControl -> GenericComm;
    DrainM.SubControl -> DrainLinkEstM;
--- 96,101 ----
    Intercept = DrainM.Intercept;
    Snoop = DrainM.Snoop;
!   RouteControl = DrainLinkEstM.RouteControl;
! 
    DrainM.SubControl -> GenericComm;
    DrainM.SubControl -> DrainLinkEstM;

Index: DrainLinkEstM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainLinkEstM.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DrainLinkEstM.nc	7 Jun 2005 16:36:23 -0000	1.12
--- DrainLinkEstM.nc	8 Jun 2005 18:39:13 -0000	1.13
***************
*** 31,34 ****
--- 31,37 ----
      interface StdControl;
      interface DrainLinkEst;
+ 
+     interface RouteControl;
+ 
      interface Attr<uint16_t> as DrainNextHop @nucleusAttr("DrainNextHop");
      interface Attr<uint16_t> as DrainNextHopCost @nucleusAttr("DrainNextHopCost");
***************
*** 413,416 ****
--- 416,447 ----
    }
  
+   command uint16_t RouteControl.getParent() {
+     return routes[0].nextHop;
+   }
+ 
+   command uint8_t RouteControl.getDepth() {
+     return routes[0].destDistance;
+   }
+ 
+   command uint16_t RouteControl.getSender(TOS_MsgPtr msg) {
+     return 0;
+   }
+ 
+   command uint8_t RouteControl.getOccupancy() {
+     return 0;
+   }
+ 
+   command uint8_t RouteControl.getQuality() {
+     return 0;
+   }
+ 
+   command result_t RouteControl.setUpdateInterval(uint16_t Interval) {
+     return FAIL;
+   }
+ 
+   command result_t RouteControl.manualUpdate() {
+     return FAIL;
+   }
+ 
    command result_t DrainNextHop.get(uint16_t* buf) {
      memcpy(buf, &routes[0].nextHop, sizeof(uint16_t));