[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector Makefile, 1.2, 1.2.2.1 TestMMDetector.nc, 1.2, 1.2.4.1 TestMMDetectorM.nc, 1.2, 1.2.4.1

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/beta/SystemCore/MementoMori/TestMMDetector

Modified Files:
      Tag: tos-1-1-8-candidate
	Makefile TestMMDetector.nc TestMMDetectorM.nc 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Makefile	8 Oct 2004 20:50:19 -0000	1.2
--- Makefile	11 Nov 2004 13:43:26 -0000	1.2.2.1
***************
*** 4,7 ****
  PFLAGS=-I %T/lib/Util -I%T/lib/TinyDB -I%T/../beta/TinierDB/ -I%T/../beta/SystemCore/MementoMori -I%T/lib/MintRoute -I%T/lib/Queue  -fno-strict-aliasing
  
! #MSG_SIZE=49
  include ../../../../apps/Makerules
--- 4,7 ----
  PFLAGS=-I %T/lib/Util -I%T/lib/TinyDB -I%T/../beta/TinierDB/ -I%T/../beta/SystemCore/MementoMori -I%T/lib/MintRoute -I%T/lib/Queue  -fno-strict-aliasing
  
! MSG_SIZE=49
  include ../../../../apps/Makerules

Index: TestMMDetector.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector/TestMMDetector.nc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** TestMMDetector.nc	20 Sep 2004 16:44:37 -0000	1.2
--- TestMMDetector.nc	11 Nov 2004 13:43:26 -0000	1.2.4.1
***************
*** 4,9 ****
  implementation {
    components Main,
!     TimeSyncC, TestMMDetectorM,
!     TimerC, RollCallC, WMEWMAMultiHopRouter as Router;
  
    Main.StdControl -> TestMMDetectorM.StdControl;
--- 4,12 ----
  implementation {
    components Main,
!     TimeSyncC, 
!     WMEWMAMultiHopRouter as Router,
!     TestMMDetectorM,
!     TimerC, 
!     RollCallC;
  
    Main.StdControl -> TestMMDetectorM.StdControl;
***************
*** 11,22 ****
--- 14,30 ----
    Main.StdControl -> TimerC.StdControl;
    Main.StdControl -> Router;
+ 
    Main.StdControl -> RollCallC;
  
    TestMMDetectorM.RouteControl -> Router;
+   // TestMMDetectorM.RouteControl -> TestMMDetectorM.DummyRC;
  
    TimeSyncC.TimeSyncPiggy -> TestMMDetectorM.PiggyBack;
+ 
    TestMMDetectorM.SourceAddress -> TimeSyncC.SourceAddress;
+   //TestMMDetectorM.SourceAddress -> TestMMDetectorM.DummySA;
  
    RollCallC.RouteControl -> Router;
+   //RollCallC.RouteControl -> TestMMDetectorM.DummyRC;
    RollCallC.HeartBeatHandler -> TestMMDetectorM.HeartBeatHandler;
  

Index: TestMMDetectorM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector/TestMMDetectorM.nc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** TestMMDetectorM.nc	20 Sep 2004 16:44:37 -0000	1.2
--- TestMMDetectorM.nc	11 Nov 2004 13:43:26 -0000	1.2.4.1
***************
*** 8,11 ****
--- 8,14 ----
      interface PiggyBack;
      interface HeartBeatHandler;
+ 
+     interface RouteControl as DummyRC;
+     interface SourceAddress as DummySA;
    }
  
***************
*** 27,32 ****
    command result_t StdControl.start() {
  
-     call Timer.start(TIMER_ONE_SHOT,
- 		     1);
  
      return SUCCESS;
--- 30,33 ----
***************
*** 40,52 ****
    event result_t Timer.fired() {
  
-     //    dbg(DBG_USR1, "Timer fired, starting the shenenigans\n");
- 
-     //    testSets();
- 
-     /*
-     if (TOS_LOCAL_ADDRESS == 0)
-       call WatcherState.addToWatch(1);
-     */
- 
      return SUCCESS;
    }
--- 41,44 ----
***************
*** 54,63 ****
    command bool TimeSyncAuthority.isAuthoritative(uint16_t addr) {
  
!     dbg(DBG_USR1, "AUTH = (parent node %u, depth %u)\n",
! 	call RouteControl.getParent(),
! 	call RouteControl.getDepth());
!  
!     return (call RouteControl.getDepth() == 0 ||
! 	    addr == call RouteControl.getParent());
    }
  
--- 46,60 ----
    command bool TimeSyncAuthority.isAuthoritative(uint16_t addr) {
  
!     if (addr == call RouteControl.getParent()) {
!       dbg(DBG_USR1, 
! 	  "Round AUTH: srcAddr = %u (parent node %u, depth %u)\n",
! 	  addr,
! 	  call RouteControl.getParent(),
! 	  call RouteControl.getDepth());
! 
!       return TRUE;
!     } else {
!       return FALSE;
!     }
    }
  
***************
*** 93,95 ****
--- 90,123 ----
    }
  
+   command uint16_t DummyRC.getParent() {
+     return 0xFFFF;
+   }
+ 
+   command uint8_t DummyRC.getDepth() {
+     return 0xFF;
+   }
+ 
+   command uint16_t DummyRC.getSender(TOS_MsgPtr msg) {
+     return 0xFFFF;
+   }
+ 
+   command uint8_t DummyRC.getOccupancy() {
+     return 0;
+   }          
+ 
+   command uint8_t DummyRC.getQuality() {
+     return 0;
+   }
+  
+   command result_t DummyRC.setUpdateInterval(uint16_t Interval) {
+     return SUCCESS;
+   }
+ 
+   command result_t DummyRC.manualUpdate() {
+     return SUCCESS;
+   }
+ 
+   command uint16_t DummySA.getAddress(TOS_MsgPtr msg) {
+     return 0xFFFF;
+   }
  }