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

diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc
index 5515cc26..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,26 +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 as Acks;
+
+		interface PacketAcknowledgements;
+		interface LowPowerListening;
+#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;
-
-	SplitControl = MAC;
-	AMSend       = MAC;
-	Receive      = MAC.Receive;
-	Snoop        = MAC.Snoop;
-	Packet       = MAC;
-	AMPacket     = MAC;
-	Acks         = MAC;
-
-	// TODO: do these from PlatformC
-//	components RealMainP, HplRF230C, RF230DriverC;
-//	RealMainP.PlatformInit -> HplRF230C.PlatformInit;
-//	RealMainP.PlatformInit -> RF230DriverC.PlatformInit;
+	components RF230ActiveMessageC as MessageC;
+
+	SplitControl = MessageC;
+
+	AMSend = MessageC;
+	Receive = MessageC.Receive;
+	Snoop = MessageC.Snoop;
+	SendNotifier = MessageC;
+
+	Packet = MessageC;
+	AMPacket = MessageC;
+
+	PacketAcknowledgements = MessageC;
+	LowPowerListening = MessageC;
+#ifdef PACKET_LINK
+	PacketLink = MessageC;
+#endif
+
+	PacketTimeStampMilli = MessageC;
+	PacketTimeStampMicro = MessageC;
 }