Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc1000 / CC1000ActiveMessageC.nc

diff --git a/tos/chips/cc1000/CC1000ActiveMessageC.nc b/tos/chips/cc1000/CC1000ActiveMessageC.nc
index d35c243d6667a10f0f13d52f6962438b7f6aecbb..1ad985b970514ab29a04015b097641b448c83593 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageC.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageC.nc
@@ -1,5 +1,3 @@
-// $Id$
-
 /*
  * "Copyright (c) 2004-2005 The Regents of the University  of California.  
  * All rights reserved.
@@ -38,7 +36,7 @@
  * addr and group).
  * 
  * @author Philip Levis
- * @date June 19 2005
+ * @author Marco Langerwisch (Packet timestamping)
  */
 
 configuration CC1000ActiveMessageC {
@@ -51,6 +49,11 @@ configuration CC1000ActiveMessageC {
     interface Packet;
     interface PacketAcknowledgements;
     interface LinkPacketMetadata;
+
+    interface PacketTimeStamp<T32khz, uint32_t> as PacketTimeStamp32khz;
+    interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
+    interface PacketTimeSyncOffset;
+    interface LowPowerListening;
   }
 }
 implementation {
@@ -73,4 +76,8 @@ implementation {
   AM.amAddress -> Address;
   AM.Packet     -> Radio;
   
+  PacketTimeStamp32khz = Radio;
+  PacketTimeStampMilli = Radio;
+  PacketTimeSyncOffset = Radio;
+  LowPowerListening    = Radio;
 }