Align serial implementaion to changes jsut made to the radio

diff --git a/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc b/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc
index 7ec4d389e90bbe05092c548e59141ad0238b80a9..bbd8938010b2900b85dd7c0506e020d0943e282c 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc
+++ b/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc
@@ -43,8 +43,10 @@ generic configuration BlockingSerialAMReceiverC(am_id_t amId) {
   }
 }
 implementation {
+  components SerialActiveMessageC;
   components BlockingSerialActiveMessageC as AM;
   BlockingReceive = AM.BlockingReceive[amId];
+  AM.Receive[amId] -> SerialActiveMessageC.Receive[amId];
   
   Packet = AM;
   AMPacket = AM;

diff --git a/tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc b/tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc
index b866dea1f413632f3cf48499ceaf196943562bc1..66c9262c716e4cea9ab467d696f131ed2a8cb5a2 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc
+++ b/tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc
@@ -45,8 +45,10 @@ generic configuration BlockingSerialAMSenderC(am_id_t AMId) {
 }
 
 implementation {
+  components SerialActiveMessageC;
   components BlockingSerialActiveMessageC as AM;
   BlockingAMSend = AM.BlockingAMSend[AMId];
+  AM.AMSend[AMId] -> SerialActiveMessageC.AMSend[AMId];
   
   Packet = AM;
   AMPacket = AM;

diff --git a/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc b/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
index 48933fafbbc460944385a277fcb224481c49e410..f9b9ed3d75fd70e18f6d13a7ab4beab0b1666cbd 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
+++ b/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
@@ -44,6 +44,10 @@ configuration BlockingSerialActiveMessageC {
     interface AMPacket;
     interface PacketAcknowledgements;
   }
+  uses {
+    interface Receive as Receive[uint8_t id];
+    interface AMSend as AMSend[uint8_t id];
+  }
 }
 implementation {
   components SerialActiveMessageC as AM;
@@ -56,8 +60,8 @@ implementation {
   BlockingAMSend = AMSenderP;
   
   BlockingStdControlC.SplitControl -> AM;
-  AMReceiverP.Receive -> AM.Receive;
-  AMSenderP.AMSend -> AM.AMSend;
+  Receive = AMReceiverP.Receive;
+  AMSend = AMSenderP.AMSend;
     
   Packet       = AM;
   AMPacket     = AM;