X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Firis%2FActiveMessageC.nc;h=e95827470fe9e07816e2d056455c99cc34a3f8a9;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=50fc987967a98fef87e97ea0772c544e17969f44;hpb=83a2281d106e4f029e97523d2e7f53034a152212;p=tinyos-2.x.git

diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc
index 50fc9879..e9582747 100644
--- a/tos/platforms/iris/ActiveMessageC.nc
+++ b/tos/platforms/iris/ActiveMessageC.nc
@@ -21,6 +21,8 @@
  * Author: Miklos Maroti
  */
 
+#include <RadioConfig.h>
+
 configuration ActiveMessageC
 {
 	provides
@@ -30,35 +32,42 @@ configuration ActiveMessageC
 		interface AMSend[uint8_t id];
 		interface Receive[uint8_t id];
 		interface Receive as Snoop[uint8_t id];
+		interface SendNotifier[am_id_t id];
+
 		interface Packet;
 		interface AMPacket;
 
 		interface PacketAcknowledgements;
-		interface PacketField<uint8_t> as PacketLinkQuality;
-		interface PacketField<uint8_t> as PacketTransmitPower;
-		interface PacketField<uint8_t> as PacketRSSI;
-		interface PacketTimeStamp<TMicro, uint16_t>;
 		interface LowPowerListening;
-		interface PacketLastTouch;
+#ifdef PACKET_LINK
+		interface PacketLink;
+#endif
+
+		interface PacketTimeStamp<TMicro, uint32_t> as PacketTimeStampMicro;
+		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
 	}
 }
 
 implementation
 {
-	components RF230ActiveMessageC as MAC;
+	components RF230ActiveMessageC as MessageC;
+
+	SplitControl = MessageC;
+
+	AMSend = MessageC;
+	Receive = MessageC.Receive;
+	Snoop = MessageC.Snoop;
+	SendNotifier = MessageC;
+
+	Packet = MessageC;
+	AMPacket = MessageC;
 
-	SplitControl = MAC;
-	AMSend       = MAC;
-	Receive      = MAC.Receive;
-	Snoop        = MAC.Snoop;
-	Packet       = MAC;
-	AMPacket     = MAC;
+	PacketAcknowledgements = MessageC;
+	LowPowerListening = MessageC;
+#ifdef PACKET_LINK
+	PacketLink = MessageC;
+#endif
 
-	PacketAcknowledgements	= MAC.PacketAcknowledgements;
-	PacketLinkQuality		= MAC.PacketLinkQuality;
-	PacketTransmitPower		= MAC.PacketTransmitPower;
-	PacketRSSI				= MAC.PacketRSSI;
-	PacketTimeStamp			= MAC.PacketTimeStamp;
-	PacketLastTouch			= MAC.PacketLastTouch;
-	LowPowerListening		= MAC.LowPowerListening;
+	PacketTimeStampMilli = MessageC;
+	PacketTimeStampMicro = MessageC;
 }