- re-designed the radio driver interfaces, restructured/improved the CC2420 radio...

[tinyos-2.x.git] / tos / lib / mac / tkn154 / RadioClientC.nc

diff --git a/tos/lib/mac/tkn154/RadioClientC.nc b/tos/lib/mac/tkn154/RadioClientC.nc
index 53b6e9b78f4ad834e01eecc0c936a48c967cb338..4412d21a79de89b43efd5df59f8fc0a86e7fc737 100644 (file)
--- a/tos/lib/mac/tkn154/RadioClientC.nc
+++ b/tos/lib/mac/tkn154/RadioClientC.nc
@@ -32,14 +32,17 @@
  * @author Jan Hauer <hauer@tkn.tu-berlin.de>
  * ========================================================================
  */
+
 #include "TKN154_MAC.h"
 generic configuration RadioClientC() 
 {
   provides
   {
+    interface RadioOff;
     interface RadioRx;
     interface RadioTx;
-    interface RadioOff;
+    interface SlottedCsmaCa;
+    interface UnslottedCsmaCa;
     interface Resource as Token;
     interface ResourceRequested as TokenRequested;
     interface ResourceTransfer;
@@ -56,20 +59,22 @@ implementation
     CLIENT = unique(IEEE802154_RADIO_RESOURCE),
   };
 
-  components FrameDispatchP;
-  RadioRx = FrameDispatchP.RadioRx[CLIENT];
-  RadioTx = FrameDispatchP.RadioTx[CLIENT];
-  RadioOff = FrameDispatchP.RadioOff[CLIENT];
-  Token = FrameDispatchP.Token[CLIENT];
-  IsResourceRequested = FrameDispatchP.IsResourceRequested;
-  TokenRequested = FrameDispatchP.TokenRequested[CLIENT];
+  components RadioControlP;
+  RadioRx = RadioControlP.RadioRx[CLIENT];
+  RadioTx = RadioControlP.RadioTx[CLIENT];
+  RadioOff = RadioControlP.RadioOff[CLIENT];
+  SlottedCsmaCa = RadioControlP.SlottedCsmaCa[CLIENT];
+  UnslottedCsmaCa = RadioControlP.UnslottedCsmaCa[CLIENT];
+  Token = RadioControlP.Token[CLIENT];
+  IsResourceRequested = RadioControlP.IsResourceRequested;
+  TokenRequested = RadioControlP.TokenRequested[CLIENT];
 
   components new TransferClientP(CLIENT);
   ResourceTransfer = TransferClientP;
   ResourceTransferred = TransferClientP;
   TransferTo = TransferClientP;
   TransferFrom = TransferClientP;
-  TransferClientP.ResourceTransferControl -> FrameDispatchP;
-  TransferClientP.Leds -> FrameDispatchP;
+  TransferClientP.ResourceTransferControl -> RadioControlP;
+  TransferClientP.Leds -> RadioControlP;
 }