From b6ecc1469fe880fdd586837a773d43a503121051 Mon Sep 17 00:00:00 2001
From: klueska <klueska>
Date: Sun, 15 Jun 2008 17:34:12 +0000
Subject: [PATCH] Align serial implementaion to changes jsut made to the radio

---
 tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc    | 2 ++
 tos/lib/tosthreads/system/BlockingSerialAMSenderC.nc      | 2 ++
 tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc b/tos/lib/tosthreads/system/BlockingSerialAMReceiverC.nc
index 7ec4d389..bbd89380 100644
--- 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 b866dea1..66c9262c 100644
--- 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 48933faf..f9b9ed3d 100644
--- 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;
-- 
2.39.2