Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / system / BlockingSerialActiveMessageC.nc

diff --git a/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc b/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
index f9b9ed3d75fd70e18f6d13a7ab4beab0b1666cbd..69c12ec77ead8051d57367e40ee8563c3aecacb6 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
+++ b/tos/lib/tosthreads/system/BlockingSerialActiveMessageC.nc
@@ -44,24 +44,21 @@ 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;
   components new BlockingStdControlC();
   components BlockingSerialAMReceiverP as AMReceiverP;
   components BlockingSerialAMSenderP as AMSenderP;
+  
   BlockingStdControl = BlockingStdControlC;
   BlockingReceive = AMReceiverP;
   BlockingReceiveAny = AMReceiverP;
   BlockingAMSend = AMSenderP;
   
   BlockingStdControlC.SplitControl -> AM;
-  Receive = AMReceiverP.Receive;
-  AMSend = AMSenderP.AMSend;
+  AMReceiverP.Receive -> AM.ReceiveDefault;
+  AMSenderP.AMSend -> AM.AMSend;
     
   Packet       = AM;
   AMPacket     = AM;