Changes to allow other subsystems to wire to underlying ActiveMessages (Send, Receive...

diff --git a/tos/lib/tosthreads/system/BlockingAMReceiverC.nc b/tos/lib/tosthreads/system/BlockingAMReceiverC.nc
index efac52cbcd0277e6c59e09b4e4add5ce873d0588..594354143d1151e41e849eef9c866016ead7a97e 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingAMReceiverC.nc
+++ b/tos/lib/tosthreads/system/BlockingAMReceiverC.nc
@@ -43,8 +43,10 @@ generic configuration BlockingAMReceiverC(am_id_t amId) {
   }
 }
 implementation {
+  components ActiveMessageC;
   components BlockingActiveMessageC as AM;
   BlockingReceive = AM.BlockingReceive[amId];
+  AM.Receive[amId] -> ActiveMessageC.Receive[amId];
   
   Packet = AM;
   AMPacket = AM;

diff --git a/tos/lib/tosthreads/system/BlockingAMSenderC.nc b/tos/lib/tosthreads/system/BlockingAMSenderC.nc
index 4d70b1e0670d586590dd3ef2b125f2398b45f666..142a8d7ee56e465a98d6c212dcfd19bee19280e0 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingAMSenderC.nc
+++ b/tos/lib/tosthreads/system/BlockingAMSenderC.nc
@@ -45,8 +45,10 @@ generic configuration BlockingAMSenderC(am_id_t AMId) {
 }
 
 implementation {
+  components ActiveMessageC;
   components BlockingActiveMessageC as AM;
   BlockingAMSend = AM.BlockingAMSend[AMId];
+  AM.AMSend[AMId] -> ActiveMessageC.AMSend[AMId];
   
   Packet = AM;
   AMPacket = AM;

diff --git a/tos/lib/tosthreads/system/BlockingAMSnooperC.nc b/tos/lib/tosthreads/system/BlockingAMSnooperC.nc
index 962bcbe12c3b71b0c9f05e79d80ec6cb7cbcfc4b..234ef2fc4f3533ed7ca84273f9f6c299301ac265 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingAMSnooperC.nc
+++ b/tos/lib/tosthreads/system/BlockingAMSnooperC.nc
@@ -43,8 +43,10 @@ generic configuration BlockingAMSnooperC(am_id_t amId) {
   }
 }
 implementation {
+  components ActiveMessageC;
   components BlockingActiveMessageC as AM;
   BlockingReceive = AM.BlockingSnoop[amId];
+  AM.Snoop[amId] -> ActiveMessageC.Snoop[amId];
   
   Packet = AM;
   AMPacket = AM;

diff --git a/tos/lib/tosthreads/system/BlockingActiveMessageC.nc b/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
index f3ab2dcdfc4f3c7cc8cb06d18f01fcc70b88bb75..f749e1c9401f0129328d0a01077ba07d0db3fb97 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
+++ b/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
@@ -46,6 +46,11 @@ configuration BlockingActiveMessageC {
     interface AMPacket;
     interface PacketAcknowledgements;
   }
+  uses {
+    interface Receive as Receive[uint8_t id];
+    interface Receive as Snoop[uint8_t id];
+    interface AMSend as AMSend[uint8_t id];
+  }
 }
 implementation {
   components ActiveMessageC as AM;
@@ -61,9 +66,9 @@ implementation {
   BlockingAMSend = AMSenderP;
   
   BlockingStdControlC.SplitControl -> AM;
-  AMReceiverP.Receive -> AM.Receive;
-  AMSnooperP.Snoop -> AM.Snoop;
-  AMSenderP.AMSend -> AM.AMSend;
+  Receive = AMReceiverP.Receive;
+  Snoop = AMSnooperP.Snoop;
+  AMSend = AMSenderP.AMSend;
     
   Packet       = AM;
   AMPacket     = AM;