define and use RADIO_SEND_RESOURCE

[tinyos-2.x.git] / tos / chips / rf2xx / rf230 / RF230RadioC.nc

diff --git a/tos/chips/rf2xx/rf230/RF230RadioC.nc b/tos/chips/rf2xx/rf230/RF230RadioC.nc
index adee914d3c923e5acd1f5e30f3b6357c169a258c..55381be9cbe910dab066e3bd30d0d81b6627b54e 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230RadioC.nc
+++ b/tos/chips/rf2xx/rf230/RF230RadioC.nc
@@ -48,7 +48,7 @@ configuration RF230RadioC
                interface Receive as Ieee154Receive;
                interface SendNotifier as Ieee154Notifier;
 
-               interface Resource as RadioSendResource[uint8_t clint];
+               interface Resource as SendResource[uint8_t clint];
 
                interface Ieee154Packet;
                interface Packet as PacketForIeee154Message;
@@ -108,7 +108,7 @@ implementation
 #ifndef IEEE154FRAMES_ENABLED
 #ifndef TFRAMES_ENABLED
        components new AutoResourceAcquireLayerC();
-       AutoResourceAcquireLayerC.Resource -> RadioSendResourceC.Resource[unique("RADIO_SEND_RESOURCE")];
+       AutoResourceAcquireLayerC.Resource -> SendResourceC.Resource[unique(RADIO_SEND_RESOURCE)];
 #else
        components new DummyLayerC() as AutoResourceAcquireLayerC;
 #endif
@@ -118,8 +118,8 @@ implementation
 // -------- RadioSend Resource
 
 #ifndef TFRAMES_ENABLED
-       components new SimpleFcfsArbiterC("RADIO_SEND_RESOURCE") as RadioSendResourceC;
-       RadioSendResource = RadioSendResourceC;
+       components new SimpleFcfsArbiterC(RADIO_SEND_RESOURCE) as SendResourceC;
+       SendResource = SendResourceC;
 
 // -------- Ieee154 Message