use SendResource with RADIO_SEND_RESOURCE for the resource

diff --git a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
index 6c40049b136b5dcdf27f793e075e19fa8420b8a7..d788fe299b51e9ab44ad75adb543110a3964c4b8 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
@@ -39,7 +39,7 @@ configuration RF212Ieee154MessageC
 
                interface Ieee154Packet;
                interface Packet;
-               interface Resource as RadioSendResource[uint8_t clint];
+               interface Resource as SendResource[uint8_t clint];
 
                interface PacketAcknowledgements;
                interface LowPowerListening;
@@ -69,7 +69,7 @@ implementation
 
        Packet = RF212RadioC.PacketForIeee154Message;
        Ieee154Packet = RF212RadioC;
-       RadioSendResource = RF212RadioC;
+       SendResource = RF212RadioC;
 
        PacketAcknowledgements = RF212RadioC;
        LowPowerListening = RF212RadioC;

diff --git a/tos/chips/rf2xx/rf212/RF212RadioC.nc b/tos/chips/rf2xx/rf212/RF212RadioC.nc
index db8e5f90cc51f193ea7ff1a716bd76e750f61f3c..23af7c98fcc038d8f47134f403a7cd2d49b79973 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212RadioC.nc
+++ b/tos/chips/rf2xx/rf212/RF212RadioC.nc
@@ -48,7 +48,7 @@ configuration RF212RadioC
                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
 

diff --git a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
index 089d4369c8e96ae4625c36bb68b77817e0479ea4..7b9700b4ea857f60b12fcce8163a70670a856656 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
@@ -39,7 +39,7 @@ configuration RF230Ieee154MessageC
 
                interface Ieee154Packet;
                interface Packet;
-               interface Resource as RadioSendResource[uint8_t clint];
+               interface Resource as SendResource[uint8_t clint];
 
                interface PacketAcknowledgements;
                interface LowPowerListening;
@@ -69,7 +69,7 @@ implementation
 
        Packet = RF230RadioC.PacketForIeee154Message;
        Ieee154Packet = RF230RadioC;
-       RadioSendResource = RF230RadioC;
+       SendResource = RF230RadioC;
 
        PacketAcknowledgements = RF230RadioC;
        LowPowerListening = RF230RadioC;

diff --git a/tos/chips/rf2xx/rf230/RF230RadioC.nc b/tos/chips/rf2xx/rf230/RF230RadioC.nc
index adee914d3c923e5acd1f5e30f3b6357c169a258c..380664b868bd598588c63e600e5d9d8bc10fc9a9 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
 

diff --git a/tos/platforms/iris/Ieee154MessageC.nc b/tos/platforms/iris/Ieee154MessageC.nc
index ce1d59bc982d48ed42581b955b7a89bcb25fac01..1c611f2a490bd5d775ce9e010e10c9a9659b7815 100644 (file)
--- a/tos/platforms/iris/Ieee154MessageC.nc
+++ b/tos/platforms/iris/Ieee154MessageC.nc
@@ -33,7 +33,7 @@ configuration Ieee154MessageC
 
                interface Packet;
                interface Ieee154Packet;
-               interface Resource as RadioSendResource[uint8_t clint];
+               interface Resource as SendResource[uint8_t clint];
 
                interface PacketAcknowledgements;
                interface LowPowerListening;
@@ -56,7 +56,7 @@ implementation
 
        Packet = MessageC;
        Ieee154Packet = MessageC;
-       RadioSendResource = MessageC;
+       SendResource = MessageC;
 
        PacketAcknowledgements = MessageC;
        LowPowerListening = MessageC;