interface SplitControl;
interface Send;
interface Receive;
- interface RadioConfig;
+ interface RadioChannel;
}
uses
{
SplitControl = MessageBufferLayerP;
Send = MessageBufferLayerP;
Receive = MessageBufferLayerP;
- RadioConfig = MessageBufferLayerP;
+ RadioChannel = MessageBufferLayerP;
RadioState = MessageBufferLayerP;
MessageBufferLayerP.Tasklet -> TaskletC;
interface Send;
interface Receive;
- interface RadioConfig;
+ interface RadioChannel;
}
uses
{
return error;
}
- command error_t RadioConfig.setChannel(uint8_t channel)
+ command error_t RadioChannel.setChannel(uint8_t channel)
{
error_t error;
return error;
}
+ command uint8_t RadioChannel.getChannel()
+ {
+ return call RadioState.getChannel();
+ }
+
task void stateDoneTask()
{
uint8_t s;
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;
}
{
}
- default event void RadioConfig.setChannelDone()
+ default event void RadioChannel.setChannelDone()
{
}
interface AMPacket;
interface PacketAcknowledgements;
interface LowPowerListening;
- interface RadioConfig;
+ interface RadioChannel;
interface PacketField<uint8_t> as PacketLinkQuality;
interface PacketField<uint8_t> as PacketTransmitPower;
PacketTimeStampRadio = RF230PacketC;
PacketTimeStampMilli = RF230PacketC;
LowPowerListening = LowPowerListeningLayerC;
- RadioConfig = MessageBufferLayerC;
+ RadioChannel = MessageBufferLayerC;
components ActiveMessageLayerC;
#ifdef TFRAMES_ENABLED
/*----------------- CHANNEL -----------------*/
+ tasklet_async command uint8_t RadioState.getChannel()
+ {
+ return channel;
+ }
+
tasklet_async command error_t RadioState.setChannel(uint8_t c)
{
c &= RF230_CHANNEL_MASK;
--- /dev/null
+/*
+ * Copyright (c) 2009, Vanderbilt University
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ *
+ * IN NO EVENT SHALL THE VANDERBILT UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE VANDERBILT
+ * UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THE VANDERBILT UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE VANDERBILT UNIVERSITY HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Author: Miklos Maroti
+ */
+
+interface RadioChannel
+{
+ /**
+ * Sets the current channel. Returns EBUSY if the stack is unable
+ * to change the channel this time (some other operation is in progress),
+ * EALREADY if the selected channel is already set, SUCCESS otherwise.
+ */
+ command error_t setChannel(uint8_t channel);
+
+ /**
+ * This event is signaled exactly once for each sucessfully posted state
+ * setChannel command when it is completed.
+ */
+ event void setChannelDone();
+
+ /**
+ * Returns the currently selected channel.
+ */
+ command uint8_t getChannel();
+}
+++ /dev/null
-/*
- * Copyright (c) 2009, Vanderbilt University
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice, the following
- * two paragraphs and the author appear in all copies of this software.
- *
- * IN NO EVENT SHALL THE VANDERBILT UNIVERSITY BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE VANDERBILT
- * UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE VANDERBILT UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE VANDERBILT UNIVERSITY HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author: Miklos Maroti
- */
-
-interface RadioConfig
-{
- /**
- * Sets the current channel. Returns EBUSY if the stack is unable
- * to change the channel this time (some other operation is in progress),
- * EALREADY if the selected channel is already set, SUCCESS otherwise.
- */
- command error_t setChannel(uint8_t channel);
-
- /**
- * This event is signaled exactly once for each sucessfully posted state
- * setChannel command when it is completed.
- */
- event void setChannelDone();
-}
* transition and setChannel command when it is completed.
*/
tasklet_async event void done();
+
+ /**
+ * Returns the currently selected channel.
+ */
+ tasklet_async command uint8_t getChannel();
}
return call SubState.setChannel(channel);
}
+ tasklet_async command uint8_t RadioState.getChannel()
+ {
+ return call SubState.getChannel();
+ }
+
task void startStopTimer()
{
if( radioCmd == RADIO_CMD_TURNON )
projects / tinyos-2.x.git / commitdiff