Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/platforms/shimmer/ActiveMessageC.nc b/tos/platforms/shimmer/ActiveMessageC.nc
index 9c705b7e1915f049bdcad62481abea5fcb474aa4..0d22877b7a32c7c0a1adc7ffa5d584a32ce80a0d 100644 (file)
--- a/tos/platforms/shimmer/ActiveMessageC.nc
+++ b/tos/platforms/shimmer/ActiveMessageC.nc
@@ -1,6 +1,6 @@
 // $Id$
 
-/*                                                                     tab:4
+/*
  * "Copyright (c) 2004-2005 The Regents of the University  of California.  
  * All rights reserved.
  *
@@ -35,11 +35,12 @@
  *
  */
 /**
- * The Active Message layer on the SHIMER platform. This is a naming wrapper
+ * The Active Message layer on the SHIMMER platform. This is a naming wrapper
  * around the CC2420 Active Message layer.
  *
  * @author Konrad Lorincz
  */
+#include "Timer.h"
 
 configuration ActiveMessageC {
   provides {
@@ -52,6 +53,9 @@ configuration ActiveMessageC {
     interface Packet;
     interface AMPacket;
     interface PacketAcknowledgements;
+    interface PacketTimeStamp<T32khz, uint32_t> as PacketTimeStamp32khz;
+    interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
+    interface LowPowerListening;
   }
 }
 implementation {
@@ -65,4 +69,9 @@ implementation {
   Packet       = AM;
   AMPacket     = AM;
   PacketAcknowledgements = AM;
+  LowPowerListening = AM;
+
+  components CC2420PacketC;
+  PacketTimeStamp32khz = CC2420PacketC;
+  PacketTimeStampMilli = CC2420PacketC;
 }