Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/lib/tosthreads/system/BlockingActiveMessageC.nc b/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
index f749e1c9401f0129328d0a01077ba07d0db3fb97..26b29ffce28164885301d6d192c70a8f0570d368 100644 (file)
--- a/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
+++ b/tos/lib/tosthreads/system/BlockingActiveMessageC.nc
@@ -46,11 +46,6 @@ 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;
@@ -66,9 +61,9 @@ implementation {
   BlockingAMSend = AMSenderP;
   
   BlockingStdControlC.SplitControl -> AM;
-  Receive = AMReceiverP.Receive;
-  Snoop = AMSnooperP.Snoop;
-  AMSend = AMSenderP.AMSend;
+  AMReceiverP.Receive -> AM.ReceiveDefault;
+  AMSnooperP.Snoop -> AM.SnoopDefault;
+  AMSenderP.AMSend -> AM.AMSend;
     
   Packet       = AM;
   AMPacket     = AM;