From 8763411b3bfed284f02e6d796efd4d94ac66f355 Mon Sep 17 00:00:00 2001
From: mmaroti <mmaroti>
Date: Sun, 20 Sep 2009 13:16:08 +0000
Subject: [PATCH] use SendResource with RADIO_SEND_RESOURCE for the resource

---
 tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc | 4 ++--
 tos/chips/rf2xx/rf212/RF212RadioC.nc          | 8 ++++----
 tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc | 4 ++--
 tos/chips/rf2xx/rf230/RF230RadioC.nc          | 8 ++++----
 tos/platforms/iris/Ieee154MessageC.nc         | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
index 6c40049b..d788fe29 100644
--- 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 db8e5f90..23af7c98 100644
--- 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 089d4369..7b9700b4 100644
--- 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 adee914d..380664b8 100644
--- 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 ce1d59bc..1c611f2a 100644
--- 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;
-- 
2.39.2