Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / micaz / ActiveMessageC.nc

diff --git a/tos/platforms/micaz/ActiveMessageC.nc b/tos/platforms/micaz/ActiveMessageC.nc
index ef766ba1f6d954da574c12f659a42515f5d12c66..aaf2bfffcc34e4020c4e620057499ebb9c11a0ae 100644 (file)
--- a/tos/platforms/micaz/ActiveMessageC.nc
+++ b/tos/platforms/micaz/ActiveMessageC.nc
@@ -37,29 +37,33 @@
 
 /**
  *
- * The Active Message layer on the micaZ platform. This is a naming wrapper
+ * The Active Message layer on the Telos platform. This is a naming wrapper
  * around the CC2420 Active Message layer.
  *
  * @author Philip Levis
- * @date June 19 2005
+ * @version $Revision$ $Date$
  */
+#include "Timer.h"
 
 configuration ActiveMessageC {
   provides {
     interface SplitControl;
 
-    interface AMSend[uint8_t id];
-    interface Receive[uint8_t id];
-    interface Receive as Snoop[uint8_t id];
+    interface AMSend[am_id_t id];
+    interface Receive[am_id_t id];
+    interface Receive as Snoop[am_id_t id];
 
     interface Packet;
     interface AMPacket;
     interface PacketAcknowledgements;
+    interface PacketTimeStamp<T32khz, uint32_t> as PacketTimeStamp32khz;
+    interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
+    interface LowPowerListening;
   }
 }
 implementation {
   components CC2420ActiveMessageC as AM;
-  
+
   SplitControl = AM;
   
   AMSend       = AM;
@@ -68,4 +72,9 @@ implementation {
   Packet       = AM;
   AMPacket     = AM;
   PacketAcknowledgements = AM;
+  LowPowerListening = AM;
+
+  components CC2420PacketC;
+  PacketTimeStamp32khz = CC2420PacketC;
+  PacketTimeStampMilli = CC2420PacketC;
 }