X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Firis%2FActiveMessageC.nc;h=b9273dac1a895cab81f8a8648b80550f8babe9ff;hb=768eb991451d242de5ef2b49f15cfd23a23d7d2e;hp=d86fd0f999dd8505e9109c5e9a6f069d89c9847d;hpb=2e472571e97ca9d56f7ba30fe837191579204d61;p=tinyos-2.x.git

diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc
index d86fd0f9..b9273dac 100644
--- a/tos/platforms/iris/ActiveMessageC.nc
+++ b/tos/platforms/iris/ActiveMessageC.nc
@@ -30,35 +30,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 DefaultMacC as MAC;
+	components RF230ActiveMessageC as MAC;
+
+	SplitControl	= MAC;
+
+	AMSend		= MAC;
+	Receive		= MAC.Receive;
+	Snoop		= MAC.Snoop;
+	SendNotifier	= MAC;
+
+	Packet		= MAC;
+	AMPacket	= MAC;
 
-	SplitControl = MAC;
-	AMSend       = MAC;
-	Receive      = MAC.Receive;
-	Snoop        = MAC.Snoop;
-	Packet       = MAC;
-	AMPacket     = MAC;
+	PacketAcknowledgements	= MAC;
+	LowPowerListening	= MAC;
+#ifdef PACKET_LINK
+	PacketLink	= MAC;
+#endif
 
-	PacketAcknowledgements	= MAC.PacketAcknowledgements;
-	PacketLinkQuality		= MAC.PacketLinkQuality;
-	PacketTransmitPower		= MAC.PacketTransmitPower;
-	PacketRSSI				= MAC.PacketRSSI;
-	PacketTimeStamp			= MAC.PacketTimeStamp;
-	PacketLastTouch			= MAC.PacketLastTouch;
-	LowPowerListening		= MAC.LowPowerListening;
+	PacketTimeStampMilli	= MAC;
+	PacketTimeStampMicro	= MAC;
 }