Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/platforms/telosa/ActiveMessageC.nc b/tos/platforms/telosa/ActiveMessageC.nc
index 4c14028d54ff6fa7336e6a5bf1a463491a1cdb4c..aaf2bfffcc34e4020c4e620057499ebb9c11a0ae 100644 (file)
--- a/tos/platforms/telosa/ActiveMessageC.nc
+++ b/tos/platforms/telosa/ActiveMessageC.nc
@@ -1,6 +1,6 @@
 // $Id$
 
-/*                                                                     tab:4
+/*
  * "Copyright (c) 2004-2005 The Regents of the University  of California.  
  * All rights reserved.
  *
@@ -43,18 +43,22 @@
  * @author Philip Levis
  * @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 {
@@ -68,4 +72,9 @@ implementation {
   Packet       = AM;
   AMPacket     = AM;
   PacketAcknowledgements = AM;
+  LowPowerListening = AM;
+
+  components CC2420PacketC;
+  PacketTimeStamp32khz = CC2420PacketC;
+  PacketTimeStampMilli = CC2420PacketC;
 }