IRIS: remove platform specific interfaces from ActiveMessageC

diff --git a/tos/chips/rf230/TimeSyncMessageC.nc b/tos/chips/rf230/TimeSyncMessageC.nc
index 79ad086717be82b771899f9959d22b0dbe8978fc..a8d4d06a33715043e3083045492b043fbfe90c32 100644 (file)
--- a/tos/chips/rf230/TimeSyncMessageC.nc
+++ b/tos/chips/rf230/TimeSyncMessageC.nc
@@ -28,6 +28,13 @@ configuration TimeSyncMessageC
 {
        provides
        {
+               interface SplitControl;
+
+               interface Receive[uint8_t id];
+               interface Receive as Snoop[am_id_t id];
+               interface Packet;
+               interface AMPacket;
+
                interface TimeSyncSend<TMicro> as TimeSyncSendMicro[am_id_t id];
                interface TimeSyncPacket<TMicro> as TimeSyncPacketMicro;
 //             interface LocalTime<TMicro> as LocalTimeMicro;
@@ -36,18 +43,13 @@ configuration TimeSyncMessageC
                interface TimeSyncPacket<TMilli> as TimeSyncPacketMilli;
                interface LocalTime<TMilli> as LocalTimeMilli;
 
-               interface SplitControl;
-               interface Receive[uint8_t id];
-               interface Receive as Snoop[am_id_t id];
-               interface Packet;
-               interface AMPacket;
-               interface PacketAcknowledgements;
+               interface PacketTimeStamp<TMicro, uint16_t>;
        }
 }
 
 implementation
 {
-       components TimeSyncMessageP, ActiveMessageC, LocalTimeMilliC;
+       components TimeSyncMessageP, RF230ActiveMessageC, LocalTimeMilliC;
 
        TimeSyncSendMicro = TimeSyncMessageP;
        TimeSyncPacketMicro = TimeSyncMessageP;
@@ -58,17 +60,17 @@ implementation
        LocalTimeMilli = LocalTimeMilliC;
 
        Packet = TimeSyncMessageP;
-       TimeSyncMessageP.SubSend -> ActiveMessageC.AMSend;
-       TimeSyncMessageP.SubPacket -> ActiveMessageC.Packet;
-       TimeSyncMessageP.PacketTimeStamp -> ActiveMessageC;
+       TimeSyncMessageP.SubSend -> RF230ActiveMessageC.AMSend;
+       TimeSyncMessageP.SubPacket -> RF230ActiveMessageC.Packet;
+       TimeSyncMessageP.PacketTimeStamp -> RF230ActiveMessageC;
 
        TimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC;
 
-       TimeSyncMessageP.PacketLastTouch -> ActiveMessageC;
+       TimeSyncMessageP.PacketLastTouch -> RF230ActiveMessageC;
 
-       SplitControl = ActiveMessageC;
-       Receive = ActiveMessageC.Receive;
-       Snoop = ActiveMessageC.Snoop;
-       AMPacket = ActiveMessageC;
-       PacketAcknowledgements = ActiveMessageC;
+       SplitControl = RF230ActiveMessageC;
+       Receive = RF230ActiveMessageC.Receive;
+       Snoop = RF230ActiveMessageC.Snoop;
+       AMPacket = RF230ActiveMessageC;
+       PacketTimeStamp = RF230ActiveMessageC;
 }

diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc
index 50fc987967a98fef87e97ea0772c544e17969f44..bdef8d0eb99db2bf87d28cbf0330fb0c137d683b 100644 (file)
--- a/tos/platforms/iris/ActiveMessageC.nc
+++ b/tos/platforms/iris/ActiveMessageC.nc
@@ -34,12 +34,8 @@ configuration ActiveMessageC
                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;
+               interface PacketTimeStamp<TMicro, uint16_t>;
        }
 }
 
@@ -55,10 +51,6 @@ implementation
        AMPacket     = MAC;
 
        PacketAcknowledgements  = MAC.PacketAcknowledgements;
-       PacketLinkQuality               = MAC.PacketLinkQuality;
-       PacketTransmitPower             = MAC.PacketTransmitPower;
-       PacketRSSI                              = MAC.PacketRSSI;
-       PacketTimeStamp                 = MAC.PacketTimeStamp;
-       PacketLastTouch                 = MAC.PacketLastTouch;
        LowPowerListening               = MAC.LowPowerListening;
+       PacketTimeStamp                 = MAC.PacketTimeStamp;
 }