[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/MultiHopRSSI MultiHopRSSI.nc, 1.22, 1.22.2.1 RSSIMultiHopRouter.nc, 1.22, 1.22.4.1

[Kristin Wright]

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

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

Index: MultiHopRSSI.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MultiHopRSSI/MultiHopRSSI.nc,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** MultiHopRSSI.nc	21 Sep 2004 03:57:53 -0000	1.22
--- MultiHopRSSI.nc	11 Nov 2004 13:43:27 -0000	1.22.2.1
***************
*** 34,37 ****
--- 34,40 ----
   */
  
+ #ifdef MH_DEBUG
+ includes EventLoggerPerl;
+ #endif
  
  includes MultiHopLayer;
***************
*** 80,83 ****
--- 83,88 ----
      interface MgmtAttr as MA_FailCounter;
      interface MgmtAttr as MA_PacketTTLDrops;
+ 
+     interface EventLogger;
    }
  }
***************
*** 409,412 ****
--- 414,424 ----
      }
  
+ #ifdef MH_DEBUG
+     <snms>
+        logEvent("Got Multihop Beacon(source=%2d,cost=%2d,tree=%2d)", 
+ 		pRP->sourceAddr, pRP->cost, pRP->treeID);
+     </snms>
+ #endif
+ 	
      return Msg;
    }

Index: RSSIMultiHopRouter.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MultiHopRSSI/RSSIMultiHopRouter.nc,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -C2 -d -r1.22 -r1.22.4.1
*** RSSIMultiHopRouter.nc	1 Sep 2004 01:32:29 -0000	1.22
--- RSSIMultiHopRouter.nc	11 Nov 2004 13:43:27 -0000	1.22.4.1
***************
*** 23,26 ****
--- 23,27 ----
      MultiHopLayerEngineM, 
      MultiHopRSSI, 
+     EventLoggerC,
      MgmtAttrsC,
      SharedMsgBufM,
***************
*** 60,64 ****
    MultiHopLayerEngineM.ReceiveMsg -> Comm.ReceiveMsg[AM_MULTIHOPLAYERMSG];
  
- 
    MultiHopLayerEngineM.MA_LocalSendRequests -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
    MultiHopLayerEngineM.MA_LocalSendFailures -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
--- 61,64 ----
***************
*** 107,110 ****
--- 107,114 ----
    MultiHopRSSI.MA_FailCounter -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
    MultiHopRSSI.MA_PacketTTLDrops -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
+ 
+ #ifdef MH_DEBUG
+   MultiHopRSSI.EventLogger -> EventLoggerC.EventLogger;
+ #endif
  }