Update of the default CC2420 to the low power listening stack. The "acknowledgement...

[tinyos-2.x.git] / tos / chips / cc2420 / CC2420TransmitC.nc

diff --git a/tos/chips/cc2420/CC2420TransmitC.nc b/tos/chips/cc2420/CC2420TransmitC.nc
index 5e0766084aa35c63726b882b9307fb5b486c68b7..12405d427ef2558bd42694ebe3b5e8a21fae84a9 100644 (file)
--- a/tos/chips/cc2420/CC2420TransmitC.nc
+++ b/tos/chips/cc2420/CC2420TransmitC.nc
@@ -36,26 +36,32 @@
  * @version $Revision$ $Date$
  */
 
-configuration CC2420TransmitC {
+#include "IEEE802154.h"
 
-  provides interface Init;
-  provides interface AsyncStdControl;
-  provides interface CC2420Transmit;
-  provides interface CsmaBackoff;
-  provides interface RadioTimeStamping;
+configuration CC2420TransmitC {
 
+  provides {
+    interface StdControl;
+    interface CC2420Transmit;
+    interface RadioBackoff;
+    interface RadioTimeStamping;
+    interface CC2420Cca;
+  }
 }
 
 implementation {
 
   components CC2420TransmitP;
-  Init = Alarm;
-  Init = CC2420TransmitP;
-  AsyncStdControl = CC2420TransmitP;
+  StdControl = CC2420TransmitP;
   CC2420Transmit = CC2420TransmitP;
-  CsmaBackoff = CC2420TransmitP;
+  RadioBackoff = CC2420TransmitP;
   RadioTimeStamping = CC2420TransmitP;
+  CC2420Cca = CC2420TransmitP;
 
+  components MainC;
+  MainC.SoftwareInit -> CC2420TransmitP;
+  MainC.SoftwareInit -> Alarm;
+  
   components AlarmMultiplexC as Alarm;
   CC2420TransmitP.BackoffTimer -> Alarm;
 
@@ -76,11 +82,17 @@ implementation {
   CC2420TransmitP.TXCTRL      -> Spi.TXCTRL;
   CC2420TransmitP.TXFIFO      -> Spi.TXFIFO;
   CC2420TransmitP.TXFIFO_RAM  -> Spi.TXFIFO_RAM;
-
+  CC2420TransmitP.MDMCTRL1    -> Spi.MDMCTRL1;
+  
   components CC2420ReceiveC;
   CC2420TransmitP.CC2420Receive -> CC2420ReceiveC;
-
-  components LedsC as Leds;
-  CC2420TransmitP.Leds -> Leds;
-
+  
+  components new TimerMilliC() as LplDisableTimerC;
+  CC2420TransmitP.LplDisableTimer -> LplDisableTimerC;
+  
+  components CC2420PacketC;
+  CC2420TransmitP.CC2420Packet -> CC2420PacketC;
+  
+  components LedsC;
+  CC2420TransmitP.Leds -> LedsC;
 }