X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420_tkn154%2FCC2420ControlTransmitC.nc;h=64e1834f630d85be5a22c6fa110318873198518f;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=97637d87ae777003cadfb0e7dea0684c28f023b1;hpb=951aef87fc91f346a3a2ab34791211f22ba88736;p=tinyos-2.x.git

diff --git a/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc b/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc
index 97637d87..64e1834f 100644
--- 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;
@@ -139,9 +142,5 @@ implementation {
   
   components CC2420ReceiveC;
   CC2420TransmitP.CC2420Receive -> CC2420ReceiveC;
-  
-  components CC2420PacketC;
-  CC2420TransmitP.CC2420Packet -> CC2420PacketC;
-  CC2420TransmitP.CC2420PacketBody -> CC2420PacketC;
 }