Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/chips/cc2420/receive/CC2420ReceiveC.nc b/tos/chips/cc2420/receive/CC2420ReceiveC.nc
index 1492f584b41b8423a07a7d32c07b7a560147d4a8..f659a9e11f549729f4fa766e757f0d7d68c54ae1 100644 (file)
--- a/tos/chips/cc2420/receive/CC2420ReceiveC.nc
+++ b/tos/chips/cc2420/receive/CC2420ReceiveC.nc
@@ -49,7 +49,6 @@ implementation {
   components MainC;
   components CC2420ReceiveP;
   components CC2420PacketC;
-  components ActiveMessageAddressC;
   components new CC2420SpiC() as Spi;
   components CC2420ControlC;
   
@@ -76,6 +75,16 @@ implementation {
   CC2420ReceiveP.SACK -> Spi.SACK;
   CC2420ReceiveP.CC2420Packet -> CC2420PacketC;
   CC2420ReceiveP.CC2420PacketBody -> CC2420PacketC;
+  CC2420ReceiveP.PacketTimeStamp -> CC2420PacketC;
   CC2420ReceiveP.CC2420Config -> CC2420ControlC;
 
+  CC2420ReceiveP.SECCTRL0 -> Spi.SECCTRL0;
+  CC2420ReceiveP.SECCTRL1 -> Spi.SECCTRL1;
+  CC2420ReceiveP.SRXDEC -> Spi.SRXDEC;
+  CC2420ReceiveP.RXNONCE -> Spi.RXNONCE;
+  CC2420ReceiveP.KEY0 -> Spi.KEY0;
+  CC2420ReceiveP.KEY1 -> Spi.KEY1;
+  CC2420ReceiveP.RXFIFO_RAM -> Spi.RXFIFO_RAM;
+  CC2420ReceiveP.SNOP -> Spi.SNOP;
+
 }