[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc1000 CC1000ActiveMessageC.nc, 1.1.2.6, 1.1.2.7 CC1000CsmaRadioC.nc, 1.1.2.18, 1.1.2.19

[Henri DF]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CC1000ActiveMessageC.nc CC1000CsmaRadioC.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: CC1000ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/Attic/CC1000ActiveMessageC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** CC1000ActiveMessageC.nc	27 Jan 2006 18:46:00 -0000	1.1.2.6
--- CC1000ActiveMessageC.nc	27 May 2006 21:18:09 -0000	1.1.2.7
***************
*** 44,48 ****
  configuration CC1000ActiveMessageC {
    provides {
-     interface Init;
      interface SplitControl;
      interface AMSend[am_id_t id];
--- 44,47 ----
***************
*** 59,63 ****
    components ActiveMessageAddressC as Address;
    
-   Init         = Radio;
    SplitControl = Radio;
    Packet       = Radio;
--- 58,61 ----

Index: CC1000CsmaRadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/Attic/CC1000CsmaRadioC.nc,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -C2 -d -r1.1.2.18 -r1.1.2.19
*** CC1000CsmaRadioC.nc	27 Jan 2006 20:24:36 -0000	1.1.2.18
--- CC1000CsmaRadioC.nc	27 May 2006 21:18:09 -0000	1.1.2.19
***************
*** 52,56 ****
  configuration CC1000CsmaRadioC {
    provides {
-     interface Init;
      interface SplitControl;
      interface Send;
--- 52,55 ----
***************
*** 74,81 ****
    components HplCC1000C as Hpl;
  
!   components RandomC, new TimerMilliC(), ActiveMessageAddressC, BusyWaitMicroC;
  
!   Init = Csma;
!   Init = Squelch;
  
    SplitControl = Csma;
--- 73,80 ----
    components HplCC1000C as Hpl;
  
!   components MainC, RandomC, new TimerMilliC(), ActiveMessageAddressC, BusyWaitMicroC;
  
!   MainC.SoftwareInit -> Csma;
!   MainC.SoftwareInit -> Squelch;
  
    SplitControl = Csma;