Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/chips/cc2420/transmit/CC2420TransmitC.nc b/tos/chips/cc2420/transmit/CC2420TransmitC.nc
index fb7bcc34e62057816ae806d742a3ce5b2993d080..bb79ee1b1c92344a1c4d822758147861c555fa88 100644 (file)
--- a/tos/chips/cc2420/transmit/CC2420TransmitC.nc
+++ b/tos/chips/cc2420/transmit/CC2420TransmitC.nc
@@ -44,7 +44,6 @@ configuration CC2420TransmitC {
     interface StdControl;
     interface CC2420Transmit;
     interface RadioBackoff;
-    interface RadioTimeStamping;
     interface ReceiveIndicator as EnergyIndicator;
     interface ReceiveIndicator as ByteIndicator;
   }
@@ -56,7 +55,6 @@ implementation {
   StdControl = CC2420TransmitP;
   CC2420Transmit = CC2420TransmitP;
   RadioBackoff = CC2420TransmitP;
-  RadioTimeStamping = CC2420TransmitP;
   EnergyIndicator = CC2420TransmitP.EnergyIndicator;
   ByteIndicator = CC2420TransmitP.ByteIndicator;
 
@@ -86,6 +84,12 @@ implementation {
   CC2420TransmitP.TXFIFO      -> Spi.TXFIFO;
   CC2420TransmitP.TXFIFO_RAM  -> Spi.TXFIFO_RAM;
   CC2420TransmitP.MDMCTRL1    -> Spi.MDMCTRL1;
+  CC2420TransmitP.SECCTRL0 -> Spi.SECCTRL0;
+  CC2420TransmitP.SECCTRL1 -> Spi.SECCTRL1;
+  CC2420TransmitP.STXENC -> Spi.STXENC;
+  CC2420TransmitP.TXNONCE -> Spi.TXNONCE;
+  CC2420TransmitP.KEY0 -> Spi.KEY0;
+  CC2420TransmitP.KEY1 -> Spi.KEY1;
   
   components CC2420ReceiveC;
   CC2420TransmitP.CC2420Receive -> CC2420ReceiveC;
@@ -93,7 +97,10 @@ implementation {
   components CC2420PacketC;
   CC2420TransmitP.CC2420Packet -> CC2420PacketC;
   CC2420TransmitP.CC2420PacketBody -> CC2420PacketC;
-  
+  CC2420TransmitP.PacketTimeStamp -> CC2420PacketC;
+  CC2420TransmitP.PacketTimeSyncOffset -> CC2420PacketC;
+
   components LedsC;
   CC2420TransmitP.Leds -> LedsC;
+
 }