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

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

diff --git a/tos/lib/mac/tkn154/RadioControlP.nc b/tos/lib/mac/tkn154/RadioControlP.nc
index ad9d541bf18308746b8172e68ec34ce3277ad260..08742945fabf323b0127c28eb4b1e6201d815c86 100644 (file)
--- a/tos/lib/mac/tkn154/RadioControlP.nc
+++ b/tos/lib/mac/tkn154/RadioControlP.nc
@@ -39,6 +39,8 @@ configuration RadioControlP
   {
     interface RadioRx as RadioRx[uint8_t client];
     interface RadioTx as RadioTx[uint8_t client];
+    interface SlottedCsmaCa as SlottedCsmaCa[uint8_t client];
+    interface UnslottedCsmaCa as UnslottedCsmaCa[uint8_t client];
     interface RadioOff as RadioOff[uint8_t client];
     interface Resource as Token[uint8_t client];
     interface ResourceRequested as TokenRequested[uint8_t client];
@@ -48,10 +50,11 @@ configuration RadioControlP
   } uses {
     interface RadioRx as PhyRx;
     interface RadioTx as PhyTx;
+    interface SlottedCsmaCa as PhySlottedCsmaCa;
+    interface UnslottedCsmaCa as PhyUnslottedCsmaCa;
     interface RadioOff as PhyRadioOff;
     interface Get<bool> as RadioPromiscuousMode;
     interface Leds;
-    interface Ieee802154Debug as Debug;
   }
 }
 implementation
@@ -59,13 +62,16 @@ implementation
   components RadioControlImplP;
   RadioRx = RadioControlImplP.MacRx;
   RadioTx = RadioControlImplP.MacTx;
+  SlottedCsmaCa = RadioControlImplP.SlottedCsmaCa;
+  UnslottedCsmaCa = RadioControlImplP.UnslottedCsmaCa;
   RadioOff = RadioControlImplP.MacRadioOff;
   PhyRx = RadioControlImplP.PhyRx;
   PhyTx = RadioControlImplP.PhyTx;
+  PhySlottedCsmaCa = RadioControlImplP.PhySlottedCsmaCa;
+  PhyUnslottedCsmaCa = RadioControlImplP.PhyUnslottedCsmaCa;
   PhyRadioOff = RadioControlImplP.PhyRadioOff;
   RadioPromiscuousMode = RadioControlImplP;
   Leds = RadioControlImplP;
-  Debug = RadioControlImplP;
   LedsRadioClient = Leds;
 
   components new SimpleRoundRobinTransferArbiterC(IEEE802154_RADIO_RESOURCE) as Arbiter;