[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420ActiveMessageC.nc, 1.1.2.9, 1.1.2.10 CC2420CsmaC.nc, 1.1.2.9, 1.1.2.10

[Henri DF]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26539/tos/chips/cc2420

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CC2420ActiveMessageC.nc CC2420CsmaC.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: CC2420ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/Attic/CC2420ActiveMessageC.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** CC2420ActiveMessageC.nc	23 Mar 2006 21:10:56 -0000	1.1.2.9
--- CC2420ActiveMessageC.nc	27 May 2006 21:18:09 -0000	1.1.2.10
***************
*** 43,47 ****
  configuration CC2420ActiveMessageC {
    provides {
-     interface Init;
      interface SplitControl;
      interface AMSend[am_id_t id];
--- 43,46 ----
***************
*** 60,64 ****
    components ActiveMessageAddressC as Address;
    
-   Init         = Radio;
    SplitControl = Radio;
    Packet       = AM;
--- 59,62 ----

Index: CC2420CsmaC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/Attic/CC2420CsmaC.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** CC2420CsmaC.nc	23 Mar 2006 21:10:56 -0000	1.1.2.9
--- CC2420CsmaC.nc	27 May 2006 21:18:09 -0000	1.1.2.10
***************
*** 42,46 ****
  configuration CC2420CsmaC {
  
-   provides interface Init;
    provides interface SplitControl;
  
--- 42,45 ----
***************
*** 56,60 ****
    components CC2420CsmaP as CsmaP;
  
-   Init = CsmaP;
    SplitControl = CsmaP;
    Send = CsmaP;
--- 55,58 ----
***************
*** 62,66 ****
  
    components CC2420ControlC;
-   Init = CC2420ControlC;
    AMPacket = CC2420ControlC;
    CsmaP.Resource -> CC2420ControlC;
--- 60,63 ----
***************
*** 68,72 ****
  
    components CC2420TransmitC;
!   Init = CC2420TransmitC;
    CsmaP.SubControl -> CC2420TransmitC;
    CsmaP.CC2420Transmit -> CC2420TransmitC;
--- 65,69 ----
  
    components CC2420TransmitC;
! 
    CsmaP.SubControl -> CC2420TransmitC;
    CsmaP.CC2420Transmit -> CC2420TransmitC;
***************
*** 74,78 ****
  
    components CC2420ReceiveC;
-   Init = CC2420ReceiveC;
    Receive = CC2420ReceiveC;
    CsmaP.SubControl -> CC2420ReceiveC;
--- 71,74 ----
***************
*** 84,86 ****
--- 80,87 ----
    CsmaP.Leds -> Leds;
  
+   components MainC;
+   MainC.SoftwareInit -> CsmaP;
+   MainC.SoftwareInit -> CC2420ControlC;
+   MainC.SoftwareInit -> CC2420TransmitC;
+   MainC.SoftwareInit -> CC2420ReceiveC;
  }