[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain DrainC.nc, 1.6, 1.7 DrainM.nc, 1.7, 1.8

[Gilman Tolle]

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

Modified Files:
	DrainC.nc DrainM.nc 
Log Message:
Added support for enabling ACKs on the CC1000

Index: DrainC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DrainC.nc	27 Apr 2005 00:21:27 -0000	1.6
--- DrainC.nc	3 May 2005 23:23:35 -0000	1.7
***************
*** 24,31 ****
      LedsC;
  
! #ifdef _CC2420CONST_H
    components CC2420RadioC;
  #endif
  
    StdControl = DrainM.StdControl;
    Receive = DrainM.Receive;
--- 24,35 ----
      LedsC;
  
! #if defined(_CC2420CONST_H)
    components CC2420RadioC;
  #endif
  
+ #if defined(_CC1KCONST_H)
+   components CC1000RadioC;
+ #endif
+ 
    StdControl = DrainM.StdControl;
    Receive = DrainM.Receive;
***************
*** 60,65 ****
  #endif
  
! #ifdef _CC2420CONST_H
    DrainM.MacControl -> CC2420RadioC;
  #endif
  }
--- 64,73 ----
  #endif
  
! #if def(_CC2420CONST_H)
    DrainM.MacControl -> CC2420RadioC;
  #endif
+ 
+ #if defined(_CC1KCONST_H)
+   DrainM.MacControl -> CC1000RadioC;
+ #endif
  }

Index: DrainM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainM.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DrainM.nc	27 Apr 2005 00:21:27 -0000	1.7
--- DrainM.nc	3 May 2005 23:23:35 -0000	1.8
***************
*** 55,59 ****
      interface Timer;
  
! #ifdef _CC2420CONST_H
      interface MacControl;
  #endif
--- 55,59 ----
      interface Timer;
  
! #if defined(_CC2420CONST_H) || defined(_CC1KCONST_H)
      interface MacControl;
  #endif
***************
*** 135,139 ****
  
    command result_t StdControl.start() {
! #ifdef _CC2420CONST_H
      call MacControl.enableAck();
  #endif
--- 135,139 ----
  
    command result_t StdControl.start() {
! #if defined(_CC2420CONST_H) || defined(_CC1KCONST_H)
      call MacControl.enableAck();
  #endif