From 60f8c4ec4b792c6a99d5ef66ee413e8712a10a1e Mon Sep 17 00:00:00 2001
From: mmaroti <mmaroti>
Date: Wed, 25 Feb 2009 20:43:57 +0000
Subject: [PATCH] implement getChannel and rename interface to RadioChannel

---
 tos/chips/rf230/MessageBufferLayerC.nc              |  4 ++--
 tos/chips/rf230/MessageBufferLayerP.nc              | 13 +++++++++----
 tos/chips/rf230/RF230ActiveMessageC.nc              |  4 ++--
 tos/chips/rf230/RF230LayerP.nc                      |  5 +++++
 tos/chips/rf230/{RadioConfig.nc => RadioChannel.nc} |  7 ++++++-
 tos/chips/rf230/RadioState.nc                       |  5 +++++
 tos/chips/rf230/TrafficMonitorLayerP.nc             |  5 +++++
 7 files changed, 34 insertions(+), 9 deletions(-)
 rename tos/chips/rf230/{RadioConfig.nc => RadioChannel.nc} (93%)

diff --git a/tos/chips/rf230/MessageBufferLayerC.nc b/tos/chips/rf230/MessageBufferLayerC.nc
index b746abbe..90402c35 100644
--- a/tos/chips/rf230/MessageBufferLayerC.nc
+++ b/tos/chips/rf230/MessageBufferLayerC.nc
@@ -28,7 +28,7 @@ configuration MessageBufferLayerC
 		interface SplitControl;
 		interface Send;
 		interface Receive;
-		interface RadioConfig;
+		interface RadioChannel;
 	}
 	uses
 	{
@@ -49,7 +49,7 @@ implementation
 	SplitControl = MessageBufferLayerP;
 	Send = MessageBufferLayerP;
 	Receive = MessageBufferLayerP;
-	RadioConfig = MessageBufferLayerP;
+	RadioChannel = MessageBufferLayerP;
 
 	RadioState = MessageBufferLayerP;
 	MessageBufferLayerP.Tasklet -> TaskletC;
diff --git a/tos/chips/rf230/MessageBufferLayerP.nc b/tos/chips/rf230/MessageBufferLayerP.nc
index bc31ef72..374edaad 100644
--- a/tos/chips/rf230/MessageBufferLayerP.nc
+++ b/tos/chips/rf230/MessageBufferLayerP.nc
@@ -33,7 +33,7 @@ module MessageBufferLayerP
 
 		interface Send;
 		interface Receive;
-		interface RadioConfig;
+		interface RadioChannel;
 	}
 	uses
 	{
@@ -100,7 +100,7 @@ implementation
 		return error;
 	}
 
-	command error_t RadioConfig.setChannel(uint8_t channel)
+	command error_t RadioChannel.setChannel(uint8_t channel)
 	{
 		error_t error;
 
@@ -119,6 +119,11 @@ implementation
 		return error;
 	}
 
+	command uint8_t RadioChannel.getChannel()
+	{
+		return call RadioState.getChannel();
+	}
+
 	task void stateDoneTask()
 	{
 		uint8_t s;
@@ -133,7 +138,7 @@ implementation
 		else if( s == STATE_TURN_OFF )
 			signal SplitControl.stopDone(SUCCESS);
 		else if( s == STATE_CHANNEL )
-			signal RadioConfig.setChannelDone();
+			signal RadioChannel.setChannelDone();
 		else	// not our event, ignore it
 			state = s;
 	}
@@ -151,7 +156,7 @@ implementation
 	{
 	}
 
-	default event void RadioConfig.setChannelDone()
+	default event void RadioChannel.setChannelDone()
 	{
 	}
 
diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
index 6a026044..892da9d9 100644
--- a/tos/chips/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf230/RF230ActiveMessageC.nc
@@ -37,7 +37,7 @@ configuration RF230ActiveMessageC
 		interface AMPacket;
 		interface PacketAcknowledgements;
 		interface LowPowerListening;
-		interface RadioConfig;
+		interface RadioChannel;
 
 		interface PacketField<uint8_t> as PacketLinkQuality;
 		interface PacketField<uint8_t> as PacketTransmitPower;
@@ -69,7 +69,7 @@ implementation
 	PacketTimeStampRadio = RF230PacketC;
 	PacketTimeStampMilli = RF230PacketC;
 	LowPowerListening = LowPowerListeningLayerC;
-	RadioConfig = MessageBufferLayerC;
+	RadioChannel = MessageBufferLayerC;
 
 	components ActiveMessageLayerC;
 #ifdef TFRAMES_ENABLED
diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF230LayerP.nc
index dac78439..9c0a3624 100644
--- a/tos/chips/rf230/RF230LayerP.nc
+++ b/tos/chips/rf230/RF230LayerP.nc
@@ -268,6 +268,11 @@ implementation
 
 /*----------------- CHANNEL -----------------*/
 
+	tasklet_async command uint8_t RadioState.getChannel()
+	{
+		return channel;
+	}
+
 	tasklet_async command error_t RadioState.setChannel(uint8_t c)
 	{
 		c &= RF230_CHANNEL_MASK;
diff --git a/tos/chips/rf230/RadioConfig.nc b/tos/chips/rf230/RadioChannel.nc
similarity index 93%
rename from tos/chips/rf230/RadioConfig.nc
rename to tos/chips/rf230/RadioChannel.nc
index 82864a61..5fa6c247 100644
--- a/tos/chips/rf230/RadioConfig.nc
+++ b/tos/chips/rf230/RadioChannel.nc
@@ -21,7 +21,7 @@
  * Author: Miklos Maroti
  */
 
-interface RadioConfig
+interface RadioChannel
 {
 	/**
 	 * Sets the current channel. Returns EBUSY if the stack is unable
@@ -35,4 +35,9 @@ interface RadioConfig
 	 * setChannel command when it is completed.
 	 */
 	event void setChannelDone();
+
+	/**
+	 * Returns the currently selected channel.
+	 */
+	command uint8_t getChannel();
 }
diff --git a/tos/chips/rf230/RadioState.nc b/tos/chips/rf230/RadioState.nc
index 72543835..cae77813 100644
--- a/tos/chips/rf230/RadioState.nc
+++ b/tos/chips/rf230/RadioState.nc
@@ -56,4 +56,9 @@ interface RadioState
 	 * transition and setChannel command when it is completed.
 	 */
 	tasklet_async event void done();
+
+	/**
+	 * Returns the currently selected channel.
+	 */
+	tasklet_async command uint8_t getChannel();
 }
diff --git a/tos/chips/rf230/TrafficMonitorLayerP.nc b/tos/chips/rf230/TrafficMonitorLayerP.nc
index 75328ac5..144fc0f5 100644
--- a/tos/chips/rf230/TrafficMonitorLayerP.nc
+++ b/tos/chips/rf230/TrafficMonitorLayerP.nc
@@ -226,6 +226,11 @@ implementation
 		return call SubState.setChannel(channel);
 	}
 
+	tasklet_async command uint8_t RadioState.getChannel()
+	{
+		return call SubState.getChannel();
+	}
+
 	task void startStopTimer()
 	{
 		if( radioCmd == RADIO_CMD_TURNON )
-- 
2.39.2