Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420_tkn154 / CC2420ControlTransmitC.nc

diff --git a/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc b/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc
index 76f8568ea7a6f1cd3f71d1224a2155614be8a323..64e1834f630d85be5a22c6fa110318873198518f 100644 (file)
--- a/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc
+++ b/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc
@@ -64,7 +64,6 @@ configuration CC2420ControlTransmitC {
     interface Alarm<T62500hz,uint32_t> as AckAlarm;
     interface CaptureTime;
     interface ReferenceTime;
-    interface Leds;
   }
 }
 
@@ -76,7 +75,6 @@ implementation {
   CC2420Config = CC2420ControlP;
   CC2420Power = CC2420ControlP;
   FrameUtility = CC2420ControlP;
-  CC2420ControlP.Leds = Leds;
 
   components MainC;
   MainC.SoftwareInit -> CC2420ControlP;
@@ -86,6 +84,7 @@ implementation {
   CC2420ControlP.CSN -> Pins.CSN;
   CC2420ControlP.RSTN -> Pins.RSTN;
   CC2420ControlP.VREN -> Pins.VREN;
+  CC2420ControlP.FIFO -> Pins.FIFO;
 
   components HplCC2420InterruptsC as Interrupts;
   CC2420ControlP.InterruptCCA -> Interrupts.InterruptCCA;
@@ -106,7 +105,10 @@ implementation {
   CC2420ControlP.TXCTRL      -> Spi.TXCTRL;
   CC2420ControlP.IEEEADR -> Spi.IEEEADR;
   CC2420ControlP.RXCTRL1 -> Spi.RXCTRL1;
+  CC2420ControlP.SFLUSHRX-> Spi.SFLUSHRX;
   CC2420ControlP.RSSI  -> Spi.RSSI;
+  CC2420ControlP.RXFIFO_REGISTER -> Spi.RXFIFO_REGISTER;
+  CC2420ControlP.SNOP -> Spi.SNOP;
 
   // CC2420TransmitC
   components CC2420TransmitP;
@@ -115,13 +117,14 @@ implementation {
   AckAlarm = CC2420TransmitP;
   CaptureTime = CC2420TransmitP;
   ReferenceTime = CC2420TransmitP;
-  CC2420TransmitP.Leds = Leds;
 
   MainC.SoftwareInit -> CC2420TransmitP;
   CC2420TransmitP.CCA -> Pins.CCA;
   CC2420TransmitP.CSN -> Pins.CSN;
   CC2420TransmitP.SFD -> Pins.SFD;
   CC2420TransmitP.CaptureSFD -> Interrupts.CaptureSFD;
+  CC2420TransmitP.FIFOP -> Pins.FIFOP;
+  CC2420TransmitP.FIFO -> Pins.FIFO;
 
   CC2420TransmitP.ChipSpiResource -> Spi;
   CC2420TransmitP.SNOP        -> Spi.SNOP;