support ActiveMessageC and Ieee154MessageC simultaneously

[tinyos-2.x.git] / tos / chips / rf2xx / rf230 / RF230ActiveMessageC.nc

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
index b11d0e2378b230f3a04256ad42170c5af5f79575..38f8d3dac66045f00a674dd2397f0b7d368c8ff0 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
@@ -23,6 +23,10 @@
 
 #include <RadioConfig.h>
 
+#ifdef IEEE154FRAMES_ENABLED
+#error "You cannot use ActiveMessageC with IEEE154FRAMES_ENABLED defined"
+#endif
+
 configuration RF230ActiveMessageC
 {
        provides 
@@ -32,12 +36,13 @@ configuration RF230ActiveMessageC
                interface AMSend[am_id_t id];
                interface Receive[am_id_t id];
                interface Receive as Snoop[am_id_t id];
+               interface SendNotifier[am_id_t id];
 
                interface Packet;
                interface AMPacket;
+
                interface PacketAcknowledgements;
                interface LowPowerListening;
-
 #ifdef PACKET_LINK
                interface PacketLink;
 #endif
@@ -56,142 +61,31 @@ configuration RF230ActiveMessageC
 
 implementation
 {
-       components RF230ActiveMessageP, IEEE154PacketLayerC, RadioAlarmC;
-
-#ifdef RADIO_DEBUG
-       components AssertC;
-#endif
-
-       RF230ActiveMessageP.IEEE154PacketLayer -> IEEE154PacketLayerC;
-       RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
-       RF230ActiveMessageP.PacketTimeStamp -> TimeStampingLayerC;
-
-       Packet = RF230ActiveMessageP;
+       components RF230RadioC;
 
-// -------- ActiveMessage
+       SplitControl = RF230RadioC;
 
-       components ActiveMessageLayerC;
-       ActiveMessageLayerC.Config -> RF230ActiveMessageP;
-       ActiveMessageLayerC.AMPacket -> IEEE154PacketLayerC;
-       ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
-       ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
-       AMSend = ActiveMessageLayerC;
-       Receive = ActiveMessageLayerC.Receive;
-       Snoop = ActiveMessageLayerC.Snoop;
-       AMPacket = IEEE154PacketLayerC;
-
-// -------- IEEE154Network
-
-#ifdef TFRAMES_ENABLED
-       components new DummyLayerC() as IEEE154NetworkLayerC;
-#else
-       components IEEE154NetworkLayerC;
-#endif
-       IEEE154NetworkLayerC.SubSend -> UniqueLayerC;
-       IEEE154NetworkLayerC.SubReceive -> LowPowerListeningLayerC;
-
-// -------- UniqueLayer Send part (wired twice)
-
-       components UniqueLayerC;
-       UniqueLayerC.Config -> RF230ActiveMessageP;
-       UniqueLayerC.SubSend -> LowPowerListeningLayerC;
-
-// -------- Low Power Listening 
-
-#ifdef LOW_POWER_LISTENING
-       components LowPowerListeningLayerC;
-       LowPowerListeningLayerC.PacketLplMetadata -> RF230ActiveMessageP;
-       LowPowerListeningLayerC.IEEE154PacketLayer -> IEEE154PacketLayerC;
-       LowPowerListeningLayerC.PacketAcknowledgements -> SoftwareAckLayerC;
-#else  
-       components LowPowerListeningDummyC as LowPowerListeningLayerC;
-#endif
-       LowPowerListeningLayerC.SubControl -> MessageBufferLayerC;
-       LowPowerListeningLayerC.SubSend -> PacketLinkLayerC;
-       LowPowerListeningLayerC.SubReceive -> MessageBufferLayerC;
-       SplitControl = LowPowerListeningLayerC;
-       LowPowerListening = LowPowerListeningLayerC;
+       AMSend = RF230RadioC;
+       Receive = RF230RadioC.Receive;
+       Snoop = RF230RadioC.Snoop;
+       SendNotifier = RF230RadioC;
 
-// -------- Packet Link
+       Packet = RF230RadioC.PacketForActiveMessage;
+       AMPacket = RF230RadioC;
 
+       PacketAcknowledgements = RF230RadioC;
+       LowPowerListening = RF230RadioC;
 #ifdef PACKET_LINK
-       components PacketLinkLayerC;
-       PacketLink = PacketLinkLayerC;
-       PacketLinkLayerC.PacketLinkMetadata -> RF230ActiveMessageP;
-       PacketLinkLayerC.PacketAcknowledgements -> SoftwareAckLayerC;
-#else
-       components new DummyLayerC() as PacketLinkLayerC;
+       PacketLink = RF230RadioC;
 #endif
-       PacketLinkLayerC.SubSend -> MessageBufferLayerC;
-
-// -------- MessageBuffer
-
-       components MessageBufferLayerC;
-       MessageBufferLayerC.Packet -> RF230ActiveMessageP;
-       MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
-       MessageBufferLayerC.RadioReceive -> UniqueLayerC;
-       MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;
-       RadioChannel = MessageBufferLayerC;
-
-// -------- UniqueLayer receive part (wired twice)
-
-       UniqueLayerC.SubReceive -> TrafficMonitorLayerC;
-
-// -------- Traffic Monitor
-
-       components TrafficMonitorLayerC;
-       TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
-       TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
-
-// -------- CollisionAvoidance
-
-#ifdef SLOTTED_MAC
-       components SlottedCollisionLayerC as CollisionAvoidanceLayerC;
-#else
-       components RandomCollisionLayerC as CollisionAvoidanceLayerC;
-#endif
-       CollisionAvoidanceLayerC.Config -> RF230ActiveMessageP;
-       CollisionAvoidanceLayerC.SubSend -> SoftwareAckLayerC;
-       CollisionAvoidanceLayerC.SubReceive -> SoftwareAckLayerC;
-
-// -------- SoftwareAcknowledgement
-
-       components SoftwareAckLayerC;
-       SoftwareAckLayerC.Config -> RF230ActiveMessageP;
-       SoftwareAckLayerC.SubSend -> CsmaLayerC;
-       SoftwareAckLayerC.SubReceive -> RF230DriverLayerC;
-       PacketAcknowledgements = SoftwareAckLayerC;
-
-// -------- Carrier Sense
-
-       components new DummyLayerC() as CsmaLayerC;
-       CsmaLayerC.Config -> RF230ActiveMessageP;
-       CsmaLayerC -> RF230DriverLayerC.RadioSend;
-       CsmaLayerC -> RF230DriverLayerC.RadioCCA;
-
-// -------- RF230 Driver
-
-       components RF230DriverLayerC;
-       RF230DriverLayerC.PacketRF230Metadata -> RF230ActiveMessageP;
-       RF230DriverLayerC.RF230DriverConfig -> RF230ActiveMessageP;
-       RF230DriverLayerC.PacketTimeStamp -> TimeStampingLayerC;
-       PacketTransmitPower = RF230DriverLayerC.PacketTransmitPower;
-       PacketLinkQuality = RF230DriverLayerC.PacketLinkQuality;
-       PacketRSSI = RF230DriverLayerC.PacketRSSI;
-       LocalTimeRadio = RF230DriverLayerC;
-
-// -------- MetadataFlags
 
-       components MetadataFlagsLayerC;
-       MetadataFlagsLayerC.PacketFlagsMetadata -> RF230ActiveMessageP;
+       RadioChannel = RF230RadioC;
 
-// -------- TimeStamping
+       PacketLinkQuality = RF230RadioC.PacketLinkQuality;
+       PacketTransmitPower = RF230RadioC.PacketTransmitPower;
+       PacketRSSI = RF230RadioC.PacketRSSI;
 
-       components TimeStampingLayerC;
-       TimeStampingLayerC.LocalTimeRadio -> RF230DriverLayerC;
-       TimeStampingLayerC.PacketTimeStampMetadata -> RF230ActiveMessageP;
-       PacketTimeStampRadio = TimeStampingLayerC;
-       PacketTimeStampMilli = TimeStampingLayerC;
+       LocalTimeRadio = RF230RadioC;
+       PacketTimeStampMilli = RF230RadioC;
+       PacketTimeStampRadio = RF230RadioC;
 }