[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/byte_radio LinkLayerControlC.nc, 1.1.2.2, 1.1.2.3 RssiFixedThresholdCMC.nc, 1.1.2.2, 1.1.2.3

[Henri DF]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28394/tos/lib/byte_radio

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	LinkLayerControlC.nc RssiFixedThresholdCMC.nc 
Log Message:
Wire ActiveMessageC's Init at the lowest layer possible, in observance of TEP107.

http://mail.millennium.berkeley.edu/pipermail/tinyos-devel/2006-March/000998.html


Index: LinkLayerControlC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/Attic/LinkLayerControlC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** LinkLayerControlC.nc	29 Mar 2006 18:03:09 -0000	1.1.2.2
--- LinkLayerControlC.nc	27 May 2006 21:23:15 -0000	1.1.2.3
***************
*** 38,42 ****
  configuration LinkLayerControlC {
     provides {
-      interface Init;
       interface SplitControl;
       interface Send;
--- 38,41 ----
***************
*** 53,59 ****
  implementation
  {
!   components LinkLayerControlP as Llc;
    
!     Init = Llc;
      SplitControl = Llc;
      MacSplitControl =  Llc.MacSplitControl;
--- 52,58 ----
  implementation
  {
!   components LinkLayerControlP as Llc, MainC;
    
!     MainC.SoftwareInit -> Llc;
      SplitControl = Llc;
      MacSplitControl =  Llc.MacSplitControl;

Index: RssiFixedThresholdCMC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/Attic/RssiFixedThresholdCMC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** RssiFixedThresholdCMC.nc	29 Mar 2006 18:03:09 -0000	1.1.2.2
--- RssiFixedThresholdCMC.nc	27 May 2006 21:23:15 -0000	1.1.2.3
***************
*** 37,41 ****
  {
    provides {
-     interface Init;
          interface StdControl;
          interface ChannelMonitor;
--- 37,40 ----
***************
*** 48,54 ****
      components RssiFixedThresholdCMP,
          RssiRefVoltC as Rssi,
          new TimerMilliC() as Timer;
  
!     Init = RssiFixedThresholdCMP;
      StdControl = RssiFixedThresholdCMP;
      StdControl = Rssi;
--- 47,54 ----
      components RssiFixedThresholdCMP,
          RssiRefVoltC as Rssi,
+         MainC,
          new TimerMilliC() as Timer;
  
!     MainC.SoftwareInit -> RssiFixedThresholdCMP;
      StdControl = RssiFixedThresholdCMP;
      StdControl = Rssi;