Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/chips/cc2420/packet/CC2420PacketC.nc b/tos/chips/cc2420/packet/CC2420PacketC.nc
index 51bc23c94e5ea17e3f04ea519019c433f8f848f2..9e3415546b1c8d1efb0811ab236f04383d77f9ee 100644 (file)
--- a/tos/chips/cc2420/packet/CC2420PacketC.nc
+++ b/tos/chips/cc2420/packet/CC2420PacketC.nc
@@ -60,11 +60,11 @@ implementation {
   PacketTimeStampMilli = CC2420PacketP;
   PacketTimeSyncOffset = CC2420PacketP;
 
-  components CC2420ActiveMessageC;
-  CC2420PacketP.Packet -> CC2420ActiveMessageC;
-
-  components Counter32khz32C, new CounterToLocalTimeC(T32khz), HilTimerMilliC;
+  components Counter32khz32C, new CounterToLocalTimeC(T32khz);
   CounterToLocalTimeC.Counter -> Counter32khz32C;
   CC2420PacketP.LocalTime32khz -> CounterToLocalTimeC;
+
+  //DummyTimer is introduced to compile apps that use no timers
+  components HilTimerMilliC, new TimerMilliC() as DummyTimer;
   CC2420PacketP.LocalTimeMilli -> HilTimerMilliC;
 }