From d03b3dc553fa13fffcc3bfd7c4e00bf34e9cbcb8 Mon Sep 17 00:00:00 2001 From: mmaroti Date: Sun, 8 Mar 2009 23:22:41 +0000 Subject: [PATCH] rename everything to support the RF212 --- .../tests/rf230/RF230Sniffer/RF230SnifferC.nc | 8 +- .../tests/rf230/RF230Sniffer/RF230SnifferP.nc | 2 +- apps/tests/rf230/RF230Test/RF230TestC.nc | 6 +- tos/chips/rf230/RF230.h | 153 ----------------- tos/chips/rf230/RF230LayerC.nc | 78 --------- tos/chips/rf230/RF2xx.h | 159 ++++++++++++++++++ ...tiveMessageC.nc => RF2xxActiveMessageC.nc} | 62 +++---- ...tiveMessageP.nc => RF2xxActiveMessageP.nc} | 35 ++-- .../{RF230Config.nc => RF2xxDriverConfig.nc} | 4 +- tos/chips/rf230/RF2xxDriverLayerC.nc | 78 +++++++++ .../{RF230LayerP.nc => RF2xxDriverLayerP.nc} | 152 ++++++++--------- .../rf230/{RF230Packet.h => RF2xxPacket.h} | 34 ++-- .../{RF230PacketC.nc => RF2xxPacketC.nc} | 28 +-- .../{RF230PacketP.nc => RF2xxPacketP.nc} | 48 +++--- ...ncMessageC.nc => RF2xxTimeSyncMessageC.nc} | 36 ++-- ...ncMessageP.nc => RF2xxTimeSyncMessageP.nc} | 2 +- tos/platforms/iris/ActiveMessageC.nc | 2 +- tos/platforms/iris/TimeSyncMessageC.nc | 22 +-- .../chips/rf230/{HplRF230.h => HplRF2xx.h} | 30 +++- .../rf230/{HplRF230C.nc => HplRF2xxC.nc} | 18 +- .../rf230/{HplRF230P.nc => HplRF2xxP.nc} | 3 +- tos/platforms/iris/chips/rf230/RadioAlarm.h | 4 +- tos/platforms/iris/platform_message.h | 47 +----- 23 files changed, 495 insertions(+), 516 deletions(-) delete mode 100644 tos/chips/rf230/RF230.h delete mode 100644 tos/chips/rf230/RF230LayerC.nc create mode 100644 tos/chips/rf230/RF2xx.h rename tos/chips/rf230/{RF230ActiveMessageC.nc => RF2xxActiveMessageC.nc} (73%) rename tos/chips/rf230/{RF230ActiveMessageP.nc => RF2xxActiveMessageP.nc} (88%) rename tos/chips/rf230/{RF230Config.nc => RF2xxDriverConfig.nc} (97%) create mode 100644 tos/chips/rf230/RF2xxDriverLayerC.nc rename tos/chips/rf230/{RF230LayerP.nc => RF2xxDriverLayerP.nc} (79%) rename tos/chips/rf230/{RF230Packet.h => RF2xxPacket.h} (68%) rename tos/chips/rf230/{RF230PacketC.nc => RF2xxPacketC.nc} (72%) rename tos/chips/rf230/{RF230PacketP.nc => RF2xxPacketP.nc} (84%) rename tos/chips/rf230/{RF230TimeSyncMessageC.nc => RF2xxTimeSyncMessageC.nc} (63%) rename tos/chips/rf230/{RF230TimeSyncMessageP.nc => RF2xxTimeSyncMessageP.nc} (99%) rename tos/platforms/iris/chips/rf230/{HplRF230.h => HplRF2xx.h} (77%) rename tos/platforms/iris/chips/rf230/{HplRF230C.nc => HplRF2xxC.nc} (85%) rename tos/platforms/iris/chips/rf230/{HplRF230P.nc => HplRF2xxP.nc} (98%) diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc index 48958393..ce078455 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc @@ -27,15 +27,15 @@ configuration RF230SnifferC implementation { - components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, RF230ActiveMessageP, IEEE154PacketC, AssertC; + components RF230SnifferP, MainC, SerialActiveMessageC, RF2xxDriverLayerC, RF2xxActiveMessageP, IEEE154PacketC, AssertC; RF230SnifferP.Boot -> MainC; RF230SnifferP.SplitControl -> SerialActiveMessageC; - RF230SnifferP.RadioState -> RF230LayerC; + RF230SnifferP.RadioState -> RF2xxDriverLayerC; - RF230LayerC.RF230Config -> RF230ActiveMessageP; + RF2xxDriverLayerC.RF2xxDriverConfig -> RF2xxActiveMessageP; - RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC; + RF2xxActiveMessageP.IEEE154Packet -> IEEE154PacketC; // just to avoid a timer compilation bug components new TimerMilliC(); diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc index 98bd7f7c..ca82c53f 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc @@ -21,7 +21,7 @@ * Author: Miklos Maroti */ -#include +#include #include #include diff --git a/apps/tests/rf230/RF230Test/RF230TestC.nc b/apps/tests/rf230/RF230Test/RF230TestC.nc index 27463abf..895e4f66 100644 --- a/apps/tests/rf230/RF230Test/RF230TestC.nc +++ b/apps/tests/rf230/RF230Test/RF230TestC.nc @@ -37,8 +37,8 @@ implementation RF230TestM.SplitControl -> SerialActiveMessageC; RF230TestM.Timer -> TimerMilliC; - components RF230LayerC, RF230ActiveMessageC; + components RF2xxDriverLayerC, RF2xxActiveMessageC; - RF230TestM.RadioState -> RF230LayerC; - RF230TestM.AMSend -> RF230ActiveMessageC; + RF230TestM.RadioState -> RF2xxDriverLayerC; + RF230TestM.AMSend -> RF2xxActiveMessageC; } diff --git a/tos/chips/rf230/RF230.h b/tos/chips/rf230/RF230.h deleted file mode 100644 index 781a1330..00000000 --- a/tos/chips/rf230/RF230.h +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2007, 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 - */ - -#ifndef __RF230_H__ -#define __RF230_H__ - -enum rf230_registers_enum -{ - RF230_TRX_STATUS = 0x01, - RF230_TRX_STATE = 0x02, - RF230_TRX_CTRL_0 = 0x03, - RF230_PHY_TX_PWR = 0x05, - RF230_PHY_RSSI = 0x06, - RF230_PHY_ED_LEVEL = 0x07, - RF230_PHY_CC_CCA = 0x08, - RF230_CCA_THRES = 0x09, - RF230_IRQ_MASK = 0x0E, - RF230_IRQ_STATUS = 0x0F, - RF230_VREG_CTRL = 0x10, - RF230_BATMON = 0x11, - RF230_XOSC_CTRL = 0x12, - RF230_PLL_CF = 0x1A, - RF230_PLL_DCU = 0x1B, - RF230_PART_NUM = 0x1C, - RF230_VERSION_NUM = 0x1D, - RF230_MAN_ID_0 = 0x1E, - RF230_MAN_ID_1 = 0x1F, - RF230_SHORT_ADDR_0 = 0x20, - RF230_SHORT_ADDR_1 = 0x21, - RF230_PAN_ID_0 = 0x22, - RF230_PAN_ID_1 = 0x23, - RF230_IEEE_ADDR_0 = 0x24, - RF230_IEEE_ADDR_1 = 0x25, - RF230_IEEE_ADDR_2 = 0x26, - RF230_IEEE_ADDR_3 = 0x27, - RF230_IEEE_ADDR_4 = 0x28, - RF230_IEEE_ADDR_5 = 0x29, - RF230_IEEE_ADDR_6 = 0x2A, - RF230_IEEE_ADDR_7 = 0x2B, - RF230_XAH_CTRL = 0x2C, - RF230_CSMA_SEED_0 = 0x2D, - RF230_CSMA_SEED_1 = 0x2E, -}; - -enum rf230_trx_register_enums -{ - RF230_CCA_DONE = 1 << 7, - RF230_CCA_STATUS = 1 << 6, - RF230_TRX_STATUS_MASK = 0x1F, - RF230_P_ON = 0, - RF230_BUSY_RX = 1, - RF230_BUSY_TX = 2, - RF230_RX_ON = 6, - RF230_TRX_OFF = 8, - RF230_PLL_ON = 9, - RF230_SLEEP = 15, - RF230_BUSY_RX_AACK = 16, - RF230_BUSR_TX_ARET = 17, - RF230_RX_AACK_ON = 22, - RF230_TX_ARET_ON = 25, - RF230_RX_ON_NOCLK = 28, - RF230_AACK_ON_NOCLK = 29, - RF230_BUSY_RX_AACK_NOCLK = 30, - RF230_STATE_TRANSITION_IN_PROGRESS = 31, - RF230_TRAC_STATUS_MASK = 0xE0, - RF230_TRAC_SUCCESS = 0, - RF230_TRAC_CHANNEL_ACCESS_FAILURE = 3 << 5, - RF230_TRAC_NO_ACK = 5 << 5, - RF230_TRX_CMD_MASK = 0x1F, - RF230_NOP = 0, - RF230_TX_START = 2, - RF230_FORCE_TRX_OFF = 3, -}; - -enum rf230_phy_register_enums -{ - RF230_TX_AUTO_CRC_ON = 1 << 7, - RF230_TX_PWR_MASK = 0x0F, - RF230_TX_PWR_DEFAULT = 0, - RF230_RSSI_MASK = 0x1F, - RF230_CCA_REQUEST = 1 << 7, - RF230_CCA_MODE_0 = 0 << 5, - RF230_CCA_MODE_1 = 1 << 5, - RF230_CCA_MODE_2 = 2 << 5, - RF230_CCA_MODE_3 = 3 << 5, - RF230_CHANNEL_DEFAULT = 11, - RF230_CHANNEL_MASK = 0x1F, - RF230_CCA_CS_THRES_SHIFT = 4, - RF230_CCA_ED_THRES_SHIFT = 0, -}; - -enum rf230_irq_register_enums -{ - RF230_IRQ_BAT_LOW = 1 << 7, - RF230_IRQ_TRX_UR = 1 << 6, - RF230_IRQ_TRX_END = 1 << 3, - RF230_IRQ_RX_START = 1 << 2, - RF230_IRQ_PLL_UNLOCK = 1 << 1, - RF230_IRQ_PLL_LOCK = 1 << 0, -}; - -enum rf230_control_register_enums -{ - RF230_AVREG_EXT = 1 << 7, - RF230_AVDD_OK = 1 << 6, - RF230_DVREG_EXT = 1 << 3, - RF230_DVDD_OK = 1 << 2, - RF230_BATMON_OK = 1 << 5, - RF230_BATMON_VHR = 1 << 4, - RF230_BATMON_VTH_MASK = 0x0F, - RF230_XTAL_MODE_OFF = 0 << 4, - RF230_XTAL_MODE_EXTERNAL = 4 << 4, - RF230_XTAL_MODE_INTERNAL = 15 << 4, -}; - -enum rf230_pll_register_enums -{ - RF230_PLL_CF_START = 1 << 7, - RF230_PLL_DCU_START = 1 << 7, -}; - -enum rf230_spi_command_enums -{ - RF230_CMD_REGISTER_READ = 0x80, - RF230_CMD_REGISTER_WRITE = 0xC0, - RF230_CMD_REGISTER_MASK = 0x3F, - RF230_CMD_FRAME_READ = 0x20, - RF230_CMD_FRAME_WRITE = 0x60, - RF230_CMD_SRAM_READ = 0x00, - RF230_CMD_SRAM_WRITE = 0x40, -}; - -#endif//__RF230_H__ diff --git a/tos/chips/rf230/RF230LayerC.nc b/tos/chips/rf230/RF230LayerC.nc deleted file mode 100644 index a89a808f..00000000 --- a/tos/chips/rf230/RF230LayerC.nc +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2007, 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 - */ - -configuration RF230LayerC -{ - provides - { - interface RadioState; - interface RadioSend; - interface RadioReceive; - interface RadioCCA; - } - - uses interface RF230Config; -} - -implementation -{ - components RF230LayerP, HplRF230C, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC, RF230PacketC, LocalTimeMicroC as LocalTimeRadioC; - - RadioState = RF230LayerP; - RadioSend = RF230LayerP; - RadioReceive = RF230LayerP; - RadioCCA = RF230LayerP; - - RF230Config = RF230LayerP; - - RF230LayerP.PacketLinkQuality -> RF230PacketC.PacketLinkQuality; - RF230LayerP.PacketTransmitPower -> RF230PacketC.PacketTransmitPower; - RF230LayerP.PacketRSSI -> RF230PacketC.PacketRSSI; - RF230LayerP.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset; - RF230LayerP.PacketTimeStamp -> RF230PacketC; - RF230LayerP.LocalTime -> LocalTimeRadioC; - - RF230LayerP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; - RadioAlarmC.Alarm -> HplRF230C.Alarm; - - RF230LayerP.SELN -> HplRF230C.SELN; - RF230LayerP.SpiResource -> HplRF230C.SpiResource; - RF230LayerP.FastSpiByte -> HplRF230C; - - RF230LayerP.SLP_TR -> HplRF230C.SLP_TR; - RF230LayerP.RSTN -> HplRF230C.RSTN; - - RF230LayerP.IRQ -> HplRF230C.IRQ; - RF230LayerP.Tasklet -> TaskletC; - RF230LayerP.BusyWait -> BusyWaitMicroC; - -#ifdef RF230_DEBUG - components DiagMsgC; - RF230LayerP.DiagMsg -> DiagMsgC; -#endif - - MainC.SoftwareInit -> RF230LayerP.SoftwareInit; - - components RealMainP; - RealMainP.PlatformInit -> RF230LayerP.PlatformInit; -} diff --git a/tos/chips/rf230/RF2xx.h b/tos/chips/rf230/RF2xx.h new file mode 100644 index 00000000..8e152ae2 --- /dev/null +++ b/tos/chips/rf230/RF2xx.h @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2007, 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 + */ + +#ifndef __RF2XX_H__ +#define __RF2XX_H__ + +enum rf2xx_chipsets_enum +{ + RF230_CHIPSET = 0, + RF212_CHIPSET = 1, +}; + +enum rf2xx_registers_enum +{ + RF2XX_TRX_STATUS = 0x01, + RF2XX_TRX_STATE = 0x02, + RF2XX_TRX_CTRL_0 = 0x03, + RF2XX_PHY_TX_PWR = 0x05, + RF2XX_PHY_RSSI = 0x06, + RF2XX_PHY_ED_LEVEL = 0x07, + RF2XX_PHY_CC_CCA = 0x08, + RF2XX_CCA_THRES = 0x09, + RF2XX_IRQ_MASK = 0x0E, + RF2XX_IRQ_STATUS = 0x0F, + RF2XX_VREG_CTRL = 0x10, + RF2XX_BATMON = 0x11, + RF2XX_XOSC_CTRL = 0x12, + RF2XX_PLL_CF = 0x1A, + RF2XX_PLL_DCU = 0x1B, + RF2XX_PART_NUM = 0x1C, + RF2XX_VERSION_NUM = 0x1D, + RF2XX_MAN_ID_0 = 0x1E, + RF2XX_MAN_ID_1 = 0x1F, + RF2XX_SHORT_ADDR_0 = 0x20, + RF2XX_SHORT_ADDR_1 = 0x21, + RF2XX_PAN_ID_0 = 0x22, + RF2XX_PAN_ID_1 = 0x23, + RF2XX_IEEE_ADDR_0 = 0x24, + RF2XX_IEEE_ADDR_1 = 0x25, + RF2XX_IEEE_ADDR_2 = 0x26, + RF2XX_IEEE_ADDR_3 = 0x27, + RF2XX_IEEE_ADDR_4 = 0x28, + RF2XX_IEEE_ADDR_5 = 0x29, + RF2XX_IEEE_ADDR_6 = 0x2A, + RF2XX_IEEE_ADDR_7 = 0x2B, + RF2XX_XAH_CTRL = 0x2C, + RF2XX_CSMA_SEED_0 = 0x2D, + RF2XX_CSMA_SEED_1 = 0x2E, +}; + +enum rf2xx_trx_register_enums +{ + RF2XX_CCA_DONE = 1 << 7, + RF2XX_CCA_STATUS = 1 << 6, + RF2XX_TRX_STATUS_MASK = 0x1F, + RF2XX_P_ON = 0, + RF2XX_BUSY_RX = 1, + RF2XX_BUSY_TX = 2, + RF2XX_RX_ON = 6, + RF2XX_TRX_OFF = 8, + RF2XX_PLL_ON = 9, + RF2XX_SLEEP = 15, + RF2XX_BUSY_RX_AACK = 16, + RF2XX_BUSR_TX_ARET = 17, + RF2XX_RX_AACK_ON = 22, + RF2XX_TX_ARET_ON = 25, + RF2XX_RX_ON_NOCLK = 28, + RF2XX_AACK_ON_NOCLK = 29, + RF2XX_BUSY_RX_AACK_NOCLK = 30, + RF2XX_STATE_TRANSITION_IN_PROGRESS = 31, + RF2XX_TRAC_STATUS_MASK = 0xE0, + RF2XX_TRAC_SUCCESS = 0, + RF2XX_TRAC_CHANNEL_ACCESS_FAILURE = 3 << 5, + RF2XX_TRAC_NO_ACK = 5 << 5, + RF2XX_TRX_CMD_MASK = 0x1F, + RF2XX_NOP = 0, + RF2XX_TX_START = 2, + RF2XX_FORCE_TRX_OFF = 3, +}; + +enum rf2xx_phy_register_enums +{ + RF2XX_TX_AUTO_CRC_ON = 1 << 7, + RF2XX_TX_PWR_MASK = 0x0F, + RF2XX_TX_PWR_DEFAULT = 0, + RF2XX_RSSI_MASK = 0x1F, + RF2XX_CCA_REQUEST = 1 << 7, + RF2XX_CCA_MODE_0 = 0 << 5, + RF2XX_CCA_MODE_1 = 1 << 5, + RF2XX_CCA_MODE_2 = 2 << 5, + RF2XX_CCA_MODE_3 = 3 << 5, + RF2XX_CHANNEL_DEFAULT = 11, + RF2XX_CHANNEL_MASK = 0x1F, + RF2XX_CCA_CS_THRES_SHIFT = 4, + RF2XX_CCA_ED_THRES_SHIFT = 0, +}; + +enum rf2xx_irq_register_enums +{ + RF2XX_IRQ_BAT_LOW = 1 << 7, + RF2XX_IRQ_TRX_UR = 1 << 6, + RF2XX_IRQ_TRX_END = 1 << 3, + RF2XX_IRQ_RX_START = 1 << 2, + RF2XX_IRQ_PLL_UNLOCK = 1 << 1, + RF2XX_IRQ_PLL_LOCK = 1 << 0, +}; + +enum rf2xx_control_register_enums +{ + RF2XX_AVREG_EXT = 1 << 7, + RF2XX_AVDD_OK = 1 << 6, + RF2XX_DVREG_EXT = 1 << 3, + RF2XX_DVDD_OK = 1 << 2, + RF2XX_BATMON_OK = 1 << 5, + RF2XX_BATMON_VHR = 1 << 4, + RF2XX_BATMON_VTH_MASK = 0x0F, + RF2XX_XTAL_MODE_OFF = 0 << 4, + RF2XX_XTAL_MODE_EXTERNAL = 4 << 4, + RF2XX_XTAL_MODE_INTERNAL = 15 << 4, +}; + +enum rf2xx_pll_register_enums +{ + RF2XX_PLL_CF_START = 1 << 7, + RF2XX_PLL_DCU_START = 1 << 7, +}; + +enum rf2xx_spi_command_enums +{ + RF2XX_CMD_REGISTER_READ = 0x80, + RF2XX_CMD_REGISTER_WRITE = 0xC0, + RF2XX_CMD_REGISTER_MASK = 0x3F, + RF2XX_CMD_FRAME_READ = 0x20, + RF2XX_CMD_FRAME_WRITE = 0x60, + RF2XX_CMD_SRAM_READ = 0x00, + RF2XX_CMD_SRAM_WRITE = 0x40, +}; + +#endif//__RF2XX_H__ diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF2xxActiveMessageC.nc similarity index 73% rename from tos/chips/rf230/RF230ActiveMessageC.nc rename to tos/chips/rf230/RF2xxActiveMessageC.nc index b0b641cc..0e58c6e1 100644 --- a/tos/chips/rf230/RF230ActiveMessageC.nc +++ b/tos/chips/rf230/RF2xxActiveMessageC.nc @@ -23,7 +23,7 @@ #include -configuration RF230ActiveMessageC +configuration RF2xxActiveMessageC { provides { @@ -50,24 +50,24 @@ configuration RF230ActiveMessageC implementation { - components RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, RadioAlarmC; + components RF2xxActiveMessageP, RF2xxPacketC, IEEE154PacketC, RadioAlarmC; -#ifdef RF230_DEBUG +#ifdef RF2XX_DEBUG components AssertC; #endif - RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC; - RF230ActiveMessageP.Packet -> RF230PacketC; - RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; - - Packet = RF230PacketC; - AMPacket = RF230PacketC; - PacketAcknowledgements = RF230PacketC; - PacketLinkQuality = RF230PacketC.PacketLinkQuality; - PacketTransmitPower = RF230PacketC.PacketTransmitPower; - PacketRSSI = RF230PacketC.PacketRSSI; - PacketTimeStampRadio = RF230PacketC; - PacketTimeStampMilli = RF230PacketC; + RF2xxActiveMessageP.IEEE154Packet -> IEEE154PacketC; + RF2xxActiveMessageP.Packet -> RF2xxPacketC; + RF2xxActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; + + Packet = RF2xxPacketC; + AMPacket = RF2xxPacketC; + PacketAcknowledgements = RF2xxPacketC; + PacketLinkQuality = RF2xxPacketC.PacketLinkQuality; + PacketTransmitPower = RF2xxPacketC.PacketTransmitPower; + PacketRSSI = RF2xxPacketC.PacketRSSI; + PacketTimeStampRadio = RF2xxPacketC; + PacketTimeStampMilli = RF2xxPacketC; LowPowerListening = LowPowerListeningLayerC; RadioChannel = MessageBufferLayerC; @@ -85,21 +85,21 @@ implementation components MessageBufferLayerC; components UniqueLayerC; components TrafficMonitorLayerC; -#ifdef RF230_SLOTTED_MAC +#ifdef RF2XX_SLOTTED_MAC components SlottedCollisionLayerC as CollisionAvoidanceLayerC; #else components RandomCollisionLayerC as CollisionAvoidanceLayerC; #endif components SoftwareAckLayerC; components new DummyLayerC() as CsmaLayerC; - components RF230LayerC; + components RF2xxDriverLayerC; SplitControl = LowPowerListeningLayerC; AMSend = ActiveMessageLayerC; Receive = ActiveMessageLayerC.Receive; Snoop = ActiveMessageLayerC.Snoop; - ActiveMessageLayerC.Config -> RF230ActiveMessageP; + ActiveMessageLayerC.Config -> RF2xxActiveMessageP; ActiveMessageLayerC.AMPacket -> IEEE154PacketC; ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC; ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC; @@ -108,41 +108,41 @@ implementation IEEE154NetworkLayerC.SubReceive -> LowPowerListeningLayerC; // the UniqueLayer is wired at two points - UniqueLayerC.Config -> RF230ActiveMessageP; + UniqueLayerC.Config -> RF2xxActiveMessageP; UniqueLayerC.SubSend -> LowPowerListeningLayerC; LowPowerListeningLayerC.SubControl -> MessageBufferLayerC; LowPowerListeningLayerC.SubSend -> MessageBufferLayerC; LowPowerListeningLayerC.SubReceive -> MessageBufferLayerC; #ifdef LOW_POWER_LISTENING - LowPowerListeningLayerC.PacketSleepInterval -> RF230PacketC; + LowPowerListeningLayerC.PacketSleepInterval -> RF2xxPacketC; LowPowerListeningLayerC.IEEE154Packet -> IEEE154PacketC; - LowPowerListeningLayerC.PacketAcknowledgements -> RF230PacketC; + LowPowerListeningLayerC.PacketAcknowledgements -> RF2xxPacketC; #endif - MessageBufferLayerC.Packet -> RF230PacketC; + MessageBufferLayerC.Packet -> RF2xxPacketC; MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC; MessageBufferLayerC.RadioReceive -> UniqueLayerC; MessageBufferLayerC.RadioState -> TrafficMonitorLayerC; UniqueLayerC.SubReceive -> TrafficMonitorLayerC; - TrafficMonitorLayerC.Config -> RF230ActiveMessageP; + TrafficMonitorLayerC.Config -> RF2xxActiveMessageP; TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC; TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC; - TrafficMonitorLayerC.SubState -> RF230LayerC; + TrafficMonitorLayerC.SubState -> RF2xxDriverLayerC; - CollisionAvoidanceLayerC.Config -> RF230ActiveMessageP; + CollisionAvoidanceLayerC.Config -> RF2xxActiveMessageP; CollisionAvoidanceLayerC.SubSend -> SoftwareAckLayerC; CollisionAvoidanceLayerC.SubReceive -> SoftwareAckLayerC; - SoftwareAckLayerC.Config -> RF230ActiveMessageP; + SoftwareAckLayerC.Config -> RF2xxActiveMessageP; SoftwareAckLayerC.SubSend -> CsmaLayerC; - SoftwareAckLayerC.SubReceive -> RF230LayerC; + SoftwareAckLayerC.SubReceive -> RF2xxDriverLayerC; - CsmaLayerC.Config -> RF230ActiveMessageP; - CsmaLayerC -> RF230LayerC.RadioSend; - CsmaLayerC -> RF230LayerC.RadioCCA; + CsmaLayerC.Config -> RF2xxActiveMessageP; + CsmaLayerC -> RF2xxDriverLayerC.RadioSend; + CsmaLayerC -> RF2xxDriverLayerC.RadioCCA; - RF230LayerC.RF230Config -> RF230ActiveMessageP; + RF2xxDriverLayerC.RF2xxDriverConfig -> RF2xxActiveMessageP; } diff --git a/tos/chips/rf230/RF230ActiveMessageP.nc b/tos/chips/rf230/RF2xxActiveMessageP.nc similarity index 88% rename from tos/chips/rf230/RF230ActiveMessageP.nc rename to tos/chips/rf230/RF2xxActiveMessageP.nc index 23096286..edc5b8f6 100644 --- a/tos/chips/rf230/RF230ActiveMessageP.nc +++ b/tos/chips/rf230/RF2xxActiveMessageP.nc @@ -21,15 +21,16 @@ * Author: Miklos Maroti */ -#include +#include #include #include +#include -module RF230ActiveMessageP +module RF2xxActiveMessageP { provides { - interface RF230Config; + interface RF2xxDriverConfig; interface SoftwareAckConfig; interface UniqueConfig; interface CsmaConfig; @@ -50,46 +51,46 @@ module RF230ActiveMessageP implementation { -/*----------------- RF230Config -----------------*/ +/*----------------- RF2xxDriverConfig -----------------*/ - async command uint8_t RF230Config.getLength(message_t* msg) + async command uint8_t RF2xxDriverConfig.getLength(message_t* msg) { return call IEEE154Packet.getLength(msg); } - async command void RF230Config.setLength(message_t* msg, uint8_t len) + async command void RF2xxDriverConfig.setLength(message_t* msg, uint8_t len) { call IEEE154Packet.setLength(msg, len); } - async command uint8_t* RF230Config.getPayload(message_t* msg) + async command uint8_t* RF2xxDriverConfig.getPayload(message_t* msg) { return ((uint8_t*)(call IEEE154Packet.getHeader(msg))) + 1; } - inline rf230packet_metadata_t* getMeta(message_t* msg) + inline rf2xxpacket_metadata_t* getMeta(message_t* msg) { - return (rf230packet_metadata_t*)(msg->metadata); + return (rf2xxpacket_metadata_t*)(msg->metadata); } - async command uint8_t RF230Config.getHeaderLength() + async command uint8_t RF2xxDriverConfig.getHeaderLength() { // we need the fcf, dsn, destpan and dest return 7; } - async command uint8_t RF230Config.getMaxLength() + async command uint8_t RF2xxDriverConfig.getMaxLength() { // note, that the ieee154_footer_t is not stored, but we should include it here - return sizeof(rf230packet_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t); + return sizeof(rf2xxpacket_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t); } - async command uint8_t RF230Config.getDefaultChannel() + async command uint8_t RF2xxDriverConfig.getDefaultChannel() { - return RF230_DEF_CHANNEL; + return RF2XX_DEF_CHANNEL; } - async command bool RF230Config.requiresRssiCca(message_t* msg) + async command bool RF2xxDriverConfig.requiresRssiCca(message_t* msg) { return call IEEE154Packet.isDataFrame(msg); } @@ -124,9 +125,9 @@ implementation async command void SoftwareAckConfig.setAckReceived(message_t* msg, bool acked) { if( acked ) - getMeta(msg)->flags |= RF230PACKET_WAS_ACKED; + getMeta(msg)->flags |= RF2XXPACKET_WAS_ACKED; else - getMeta(msg)->flags &= ~RF230PACKET_WAS_ACKED; + getMeta(msg)->flags &= ~RF2XXPACKET_WAS_ACKED; } async command uint16_t SoftwareAckConfig.getAckTimeout() diff --git a/tos/chips/rf230/RF230Config.nc b/tos/chips/rf230/RF2xxDriverConfig.nc similarity index 97% rename from tos/chips/rf230/RF230Config.nc rename to tos/chips/rf230/RF2xxDriverConfig.nc index 2662a928..47f73378 100644 --- a/tos/chips/rf230/RF230Config.nc +++ b/tos/chips/rf230/RF2xxDriverConfig.nc @@ -23,9 +23,9 @@ /** * This interface needs to be implemented by the MAC to control the behaviour - * of the RF230LayerC component. + * of the RF2xxDriverLayerC component. */ -interface RF230Config +interface RF2xxDriverConfig { /** * Returns the length of the PHY payload (including the FCF field). diff --git a/tos/chips/rf230/RF2xxDriverLayerC.nc b/tos/chips/rf230/RF2xxDriverLayerC.nc new file mode 100644 index 00000000..5ce75ebf --- /dev/null +++ b/tos/chips/rf230/RF2xxDriverLayerC.nc @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2007, 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 + */ + +configuration RF2xxDriverLayerC +{ + provides + { + interface RadioState; + interface RadioSend; + interface RadioReceive; + interface RadioCCA; + } + + uses interface RF2xxDriverConfig; +} + +implementation +{ + components RF2xxDriverLayerP, HplRF2xxC, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC, RF2xxPacketC, LocalTimeMicroC as LocalTimeRadioC; + + RadioState = RF2xxDriverLayerP; + RadioSend = RF2xxDriverLayerP; + RadioReceive = RF2xxDriverLayerP; + RadioCCA = RF2xxDriverLayerP; + + RF2xxDriverConfig = RF2xxDriverLayerP; + + RF2xxDriverLayerP.PacketLinkQuality -> RF2xxPacketC.PacketLinkQuality; + RF2xxDriverLayerP.PacketTransmitPower -> RF2xxPacketC.PacketTransmitPower; + RF2xxDriverLayerP.PacketRSSI -> RF2xxPacketC.PacketRSSI; + RF2xxDriverLayerP.PacketTimeSyncOffset -> RF2xxPacketC.PacketTimeSyncOffset; + RF2xxDriverLayerP.PacketTimeStamp -> RF2xxPacketC; + RF2xxDriverLayerP.LocalTime -> LocalTimeRadioC; + + RF2xxDriverLayerP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; + RadioAlarmC.Alarm -> HplRF2xxC.Alarm; + + RF2xxDriverLayerP.SELN -> HplRF2xxC.SELN; + RF2xxDriverLayerP.SpiResource -> HplRF2xxC.SpiResource; + RF2xxDriverLayerP.FastSpiByte -> HplRF2xxC; + + RF2xxDriverLayerP.SLP_TR -> HplRF2xxC.SLP_TR; + RF2xxDriverLayerP.RSTN -> HplRF2xxC.RSTN; + + RF2xxDriverLayerP.IRQ -> HplRF2xxC.IRQ; + RF2xxDriverLayerP.Tasklet -> TaskletC; + RF2xxDriverLayerP.BusyWait -> BusyWaitMicroC; + +#ifdef RF2XX_DEBUG + components DiagMsgC; + RF2xxDriverLayerP.DiagMsg -> DiagMsgC; +#endif + + MainC.SoftwareInit -> RF2xxDriverLayerP.SoftwareInit; + + components RealMainP; + RealMainP.PlatformInit -> RF2xxDriverLayerP.PlatformInit; +} diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF2xxDriverLayerP.nc similarity index 79% rename from tos/chips/rf230/RF230LayerP.nc rename to tos/chips/rf230/RF2xxDriverLayerP.nc index fb429b93..c23a8222 100644 --- a/tos/chips/rf230/RF230LayerP.nc +++ b/tos/chips/rf230/RF2xxDriverLayerP.nc @@ -21,14 +21,14 @@ * Author: Miklos Maroti */ -#include -#include +#include +#include #include #include #include #include -module RF230LayerP +module RF2xxDriverLayerP { provides { @@ -63,11 +63,11 @@ module RF230LayerP interface PacketTimeStamp; interface LocalTime; - interface RF230Config; + interface RF2xxDriverConfig; interface Tasklet; interface RadioAlarm; -#ifdef RF230_DEBUG +#ifdef RF2XX_DEBUG interface DiagMsg; #endif } @@ -101,7 +101,7 @@ implementation CMD_RECEIVE = 5, // currently receiving a message CMD_CCA = 6, // performing clear chanel assesment CMD_CHANNEL = 7, // changing the channel - CMD_SIGNAL_DONE = 8, // signal the end of the state transition + CMD_SIGNAL_DONE = 8, // signal the end of the state transition CMD_DOWNLOAD = 9, // download the received message }; @@ -123,10 +123,10 @@ implementation inline void writeRegister(uint8_t reg, uint8_t value) { ASSERT( call SpiResource.isOwner() ); - ASSERT( reg == (reg & RF230_CMD_REGISTER_MASK) ); + ASSERT( reg == (reg & RF2XX_CMD_REGISTER_MASK) ); call SELN.clr(); - call FastSpiByte.splitWrite(RF230_CMD_REGISTER_WRITE | reg); + call FastSpiByte.splitWrite(RF2XX_CMD_REGISTER_WRITE | reg); call FastSpiByte.splitReadWrite(value); call FastSpiByte.splitRead(); call SELN.set(); @@ -135,10 +135,10 @@ implementation inline uint8_t readRegister(uint8_t reg) { ASSERT( call SpiResource.isOwner() ); - ASSERT( reg == (reg & RF230_CMD_REGISTER_MASK) ); + ASSERT( reg == (reg & RF2XX_CMD_REGISTER_MASK) ); call SELN.clr(); - call FastSpiByte.splitWrite(RF230_CMD_REGISTER_READ | reg); + call FastSpiByte.splitWrite(RF2XX_CMD_REGISTER_READ | reg); call FastSpiByte.splitReadWrite(0); reg = call FastSpiByte.splitRead(); call SELN.set(); @@ -168,11 +168,11 @@ implementation ASSERT( state == STATE_RX_ON ); cmd = CMD_NONE; - cca = readRegister(RF230_TRX_STATUS); + cca = readRegister(RF2XX_TRX_STATUS); - ASSERT( (cca & RF230_TRX_STATUS_MASK) == RF230_RX_ON ); + ASSERT( (cca & RF2XX_TRX_STATUS_MASK) == RF2XX_RX_ON ); - signal RadioCCA.done( (cca & RF230_CCA_DONE) ? ((cca & RF230_CCA_STATUS) ? SUCCESS : EBUSY) : FAIL ); + signal RadioCCA.done( (cca & RF2XX_CCA_DONE) ? ((cca & RF2XX_CCA_STATUS) ? SUCCESS : EBUSY) : FAIL ); } else ASSERT(FALSE); @@ -216,18 +216,18 @@ implementation call BusyWait.wait(6); call RSTN.set(); - writeRegister(RF230_TRX_CTRL_0, RF230_TRX_CTRL_0_VALUE); - writeRegister(RF230_TRX_STATE, RF230_TRX_OFF); + writeRegister(RF2XX_TRX_CTRL_0, RF2XX_TRX_CTRL_0_VALUE); + writeRegister(RF2XX_TRX_STATE, RF2XX_TRX_OFF); call BusyWait.wait(510); - writeRegister(RF230_IRQ_MASK, RF230_IRQ_TRX_UR | RF230_IRQ_PLL_LOCK | RF230_IRQ_TRX_END | RF230_IRQ_RX_START); - writeRegister(RF230_CCA_THRES, RF230_CCA_THRES_VALUE); - writeRegister(RF230_PHY_TX_PWR, RF230_TX_AUTO_CRC_ON | RF230_TX_PWR_DEFAULT); + writeRegister(RF2XX_IRQ_MASK, RF2XX_IRQ_TRX_UR | RF2XX_IRQ_PLL_LOCK | RF2XX_IRQ_TRX_END | RF2XX_IRQ_RX_START); + writeRegister(RF2XX_CCA_THRES, RF2XX_CCA_THRES_VALUE); + writeRegister(RF2XX_PHY_TX_PWR, RF2XX_TX_AUTO_CRC_ON | RF2XX_TX_PWR_DEFAULT); - txPower = RF230_TX_PWR_DEFAULT; - channel = call RF230Config.getDefaultChannel() & RF230_CHANNEL_MASK; - writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel); + txPower = RF2XX_TX_PWR_DEFAULT; + channel = call RF2xxDriverConfig.getDefaultChannel() & RF2XX_CHANNEL_MASK; + writeRegister(RF2XX_PHY_CC_CCA, RF2XX_CCA_MODE_VALUE | channel); call SLP_TR.set(); state = STATE_SLEEP; @@ -275,7 +275,7 @@ implementation tasklet_async command error_t RadioState.setChannel(uint8_t c) { - c &= RF230_CHANNEL_MASK; + c &= RF2XX_CHANNEL_MASK; if( cmd != CMD_NONE ) return EBUSY; @@ -296,7 +296,7 @@ implementation if( isSpiAcquired() ) { - writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel); + writeRegister(RF2XX_PHY_CC_CCA, RF2XX_CCA_MODE_VALUE | channel); if( state == STATE_RX_ON ) state = STATE_TRX_OFF_2_RX_ON; @@ -321,19 +321,19 @@ implementation { ASSERT( ! radioIrq ); - readRegister(RF230_IRQ_STATUS); // clear the interrupt register + readRegister(RF2XX_IRQ_STATUS); // clear the interrupt register call IRQ.captureRisingEdge(); // setChannel was ignored in SLEEP because the SPI was not working, so do it here - writeRegister(RF230_PHY_CC_CCA, RF230_CCA_MODE_VALUE | channel); + writeRegister(RF2XX_PHY_CC_CCA, RF2XX_CCA_MODE_VALUE | channel); - writeRegister(RF230_TRX_STATE, RF230_RX_ON); + writeRegister(RF2XX_TRX_STATE, RF2XX_RX_ON); state = STATE_TRX_OFF_2_RX_ON; } else if( (cmd == CMD_TURNOFF || cmd == CMD_STANDBY) && state == STATE_RX_ON && isSpiAcquired() ) { - writeRegister(RF230_TRX_STATE, RF230_FORCE_TRX_OFF); + writeRegister(RF2XX_TRX_STATE, RF2XX_FORCE_TRX_OFF); call IRQ.disable(); radioIrq = FALSE; @@ -407,28 +407,28 @@ implementation return EBUSY; length = (call PacketTransmitPower.isSet(msg) ? - call PacketTransmitPower.get(msg) : RF230_DEF_RFPOWER) & RF230_TX_PWR_MASK; + call PacketTransmitPower.get(msg) : RF2XX_DEF_RFPOWER) & RF2XX_TX_PWR_MASK; if( length != txPower ) { txPower = length; - writeRegister(RF230_PHY_TX_PWR, RF230_TX_AUTO_CRC_ON | txPower); + writeRegister(RF2XX_PHY_TX_PWR, RF2XX_TX_AUTO_CRC_ON | txPower); } - if( call RF230Config.requiresRssiCca(msg) - && (readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK) > ((rssiClear + rssiBusy) >> 3) ) + if( call RF2xxDriverConfig.requiresRssiCca(msg) + && (readRegister(RF2XX_PHY_RSSI) & RF2XX_RSSI_MASK) > ((rssiClear + rssiBusy) >> 3) ) return EBUSY; - writeRegister(RF230_TRX_STATE, RF230_PLL_ON); + writeRegister(RF2XX_TRX_STATE, RF2XX_PLL_ON); // do something useful, just to wait a little time32 = call LocalTime.get(); timesync = call PacketTimeSyncOffset.isSet(msg) ? msg->data + call PacketTimeSyncOffset.get(msg) : 0; // we have missed an incoming message in this short amount of time - if( (readRegister(RF230_TRX_STATUS) & RF230_TRX_STATUS_MASK) != RF230_PLL_ON ) + if( (readRegister(RF2XX_TRX_STATUS) & RF2XX_TRX_STATUS_MASK) != RF2XX_PLL_ON ) { - ASSERT( (readRegister(RF230_TRX_STATUS) & RF230_TRX_STATUS_MASK) == RF230_BUSY_RX ); + ASSERT( (readRegister(RF2XX_TRX_STATUS) & RF2XX_TRX_STATUS_MASK) == RF2XX_BUSY_RX ); state = STATE_PLL_ON_2_RX_ON; return EBUSY; @@ -444,10 +444,10 @@ implementation ASSERT( ! radioIrq ); call SELN.clr(); - call FastSpiByte.splitWrite(RF230_CMD_FRAME_WRITE); + call FastSpiByte.splitWrite(RF2XX_CMD_FRAME_WRITE); - length = call RF230Config.getLength(msg); - data = call RF230Config.getPayload(msg); + length = call RF2xxDriverConfig.getLength(msg); + data = call RF2xxDriverConfig.getPayload(msg); // length | data[0] ... data[length-3] | automatically generated FCS call FastSpiByte.splitReadWrite(length); @@ -455,7 +455,7 @@ implementation // the FCS is atomatically generated (2 bytes) length -= 2; - header = call RF230Config.getHeaderLength(); + header = call RF2xxDriverConfig.getHeaderLength(); if( header > length ) header = length; @@ -482,7 +482,7 @@ implementation call SELN.set(); /* - * There is a very small window (~1 microsecond) when the RF230 went + * There is a very small window (~1 microsecond) when the RF2xx went * into PLL_ON state but was somehow not properly initialized because * of an incoming message and could not go into BUSY_TX. I think the * radio can even receive a message, and generate a TRX_UR interrupt @@ -494,12 +494,12 @@ implementation */ // go back to RX_ON state when finished - writeRegister(RF230_TRX_STATE, RF230_RX_ON); + writeRegister(RF2XX_TRX_STATE, RF2XX_RX_ON); -#ifdef RF230_DEBUG_MESSAGES +#ifdef RF2XX_DEBUG_MESSAGES if( call DiagMsg.record() ) { - length = call RF230Config.getLength(msg); + length = call RF2xxDriverConfig.getLength(msg); call DiagMsg.str("tx"); call DiagMsg.uint16(time); @@ -532,10 +532,10 @@ implementation return EBUSY; // see Errata B7 of the datasheet - // writeRegister(RF230_TRX_STATE, RF230_PLL_ON); - // writeRegister(RF230_TRX_STATE, RF230_RX_ON); + // writeRegister(RF2XX_TRX_STATE, RF2XX_PLL_ON); + // writeRegister(RF2XX_TRX_STATE, RF2XX_RX_ON); - writeRegister(RF230_PHY_CC_CCA, RF230_CCA_REQUEST | RF230_CCA_MODE_VALUE | channel); + writeRegister(RF2XX_PHY_CC_CCA, RF2XX_CCA_REQUEST | RF2XX_CCA_MODE_VALUE | channel); call RadioAlarm.wait(CCA_REQUEST_TIME); cmd = CMD_CCA; @@ -552,13 +552,13 @@ implementation uint16_t crc; call SELN.clr(); - call FastSpiByte.write(RF230_CMD_FRAME_READ); + call FastSpiByte.write(RF2XX_CMD_FRAME_READ); // read the length byte length = call FastSpiByte.write(0); // if correct length - if( length >= 3 && length <= call RF230Config.getMaxLength() ) + if( length >= 3 && length <= call RF2xxDriverConfig.getMaxLength() ) { uint8_t read; uint8_t* data; @@ -566,31 +566,31 @@ implementation // initiate the reading call FastSpiByte.splitWrite(0); - call RF230Config.setLength(rxMsg, length); - data = call RF230Config.getPayload(rxMsg); + call RF2xxDriverConfig.setLength(rxMsg, length); + data = call RF2xxDriverConfig.getPayload(rxMsg); crc = 0; // we do not store the CRC field length -= 2; - read = call RF230Config.getHeaderLength(); + read = call RF2xxDriverConfig.getHeaderLength(); if( length < read ) read = length; length -= read; do { - crc = RF230_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0)); + crc = RF2XX_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0)); } while( --read != 0 ); if( signal RadioReceive.header(rxMsg) ) { while( length-- != 0 ) - crc = RF230_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0)); + crc = RF2XX_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0)); - crc = RF230_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0)); - crc = RF230_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0)); + crc = RF2XX_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0)); + crc = RF2XX_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0)); call PacketLinkQuality.set(rxMsg, call FastSpiByte.splitRead()); } @@ -603,17 +603,17 @@ implementation call SELN.set(); state = STATE_RX_ON; -#ifdef RF230_DEBUG_MESSAGES +#ifdef RF2XX_DEBUG_MESSAGES if( call DiagMsg.record() ) { - length = call RF230Config.getLength(rxMsg); + length = call RF2xxDriverConfig.getLength(rxMsg); call DiagMsg.str("rx"); call DiagMsg.uint32(call PacketTimeStamp.isValid(rxMsg) ? call PacketTimeStamp.timestamp(rxMsg) : 0); call DiagMsg.uint16(call RadioAlarm.getNow()); call DiagMsg.uint8(crc != 0); call DiagMsg.uint8(length); - call DiagMsg.hex8s(call RF230Config.getPayload(rxMsg), length - 2); + call DiagMsg.hex8s(call RF2xxDriverConfig.getPayload(rxMsg), length - 2); call DiagMsg.send(); } #endif @@ -651,18 +651,18 @@ implementation atomic time = capturedTime; radioIrq = FALSE; - irq = readRegister(RF230_IRQ_STATUS); + irq = readRegister(RF2XX_IRQ_STATUS); -#ifdef RF230_DEBUG +#ifdef RF2XX_DEBUG // TODO: handle this interrupt - if( irq & RF230_IRQ_TRX_UR ) + if( irq & RF2XX_IRQ_TRX_UR ) { if( call DiagMsg.record() ) { call DiagMsg.str("assert ur"); call DiagMsg.uint16(call RadioAlarm.getNow()); - call DiagMsg.hex8(readRegister(RF230_TRX_STATUS)); - call DiagMsg.hex8(readRegister(RF230_TRX_STATE)); + call DiagMsg.hex8(readRegister(RF2XX_TRX_STATUS)); + call DiagMsg.hex8(readRegister(RF2XX_TRX_STATE)); call DiagMsg.hex8(irq); call DiagMsg.uint8(state); call DiagMsg.uint8(cmd); @@ -671,7 +671,7 @@ implementation } #endif - if( irq & RF230_IRQ_PLL_LOCK ) + if( irq & RF2XX_IRQ_PLL_LOCK ) { if( cmd == CMD_TURNON || cmd == CMD_CHANNEL ) { @@ -688,7 +688,7 @@ implementation ASSERT(FALSE); } - if( irq & RF230_IRQ_RX_START ) + if( irq & RF2XX_IRQ_RX_START ) { if( cmd == CMD_CCA ) { @@ -701,11 +701,11 @@ implementation ASSERT( state == STATE_RX_ON || state == STATE_PLL_ON_2_RX_ON ); // the most likely place for busy channel, with no TRX_END interrupt - if( irq == RF230_IRQ_RX_START ) + if( irq == RF2XX_IRQ_RX_START ) { - temp = readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK; + temp = readRegister(RF2XX_PHY_RSSI) & RF2XX_RSSI_MASK; rssiBusy += temp - (rssiBusy >> 2); -#ifndef RF230_RSSI_ENERGY +#ifndef RF2XX_RSSI_ENERGY call PacketRSSI.set(rxMsg, temp); } else @@ -722,7 +722,7 @@ implementation * we could not be after a transmission, because then cmd = * CMD_TRANSMIT. */ - if( irq == RF230_IRQ_RX_START ) // just to be cautious + if( irq == RF2XX_IRQ_RX_START ) // just to be cautious { time32 = call LocalTime.get(); time32 += (int16_t)(time - RX_SFD_DELAY) - (int16_t)(time32); @@ -737,7 +737,7 @@ implementation ASSERT( cmd == CMD_TURNOFF ); } - if( irq & RF230_IRQ_TRX_END ) + if( irq & RF2XX_IRQ_TRX_END ) { if( cmd == CMD_TRANSMIT ) { @@ -748,28 +748,28 @@ implementation signal RadioSend.sendDone(SUCCESS); // TODO: we could have missed a received message - ASSERT( ! (irq & RF230_IRQ_RX_START) ); + ASSERT( ! (irq & RF2XX_IRQ_RX_START) ); } else if( cmd == CMD_RECEIVE ) { ASSERT( state == STATE_RX_ON || state == STATE_PLL_ON_2_RX_ON ); -#ifdef RF230_RSSI_ENERGY - if( irq == RF230_IRQ_TRX_END ) - call PacketRSSI.set(rxMsg, readRegister(RF230_PHY_ED_LEVEL)); +#ifdef RF2XX_RSSI_ENERGY + if( irq == RF2XX_IRQ_TRX_END ) + call PacketRSSI.set(rxMsg, readRegister(RF2XX_PHY_ED_LEVEL)); else call PacketRSSI.clear(rxMsg); #endif if( state == STATE_PLL_ON_2_RX_ON ) { - ASSERT( (readRegister(RF230_TRX_STATUS) & RF230_TRX_STATUS_MASK) == RF230_PLL_ON ); + ASSERT( (readRegister(RF2XX_TRX_STATUS) & RF2XX_TRX_STATUS_MASK) == RF2XX_PLL_ON ); - writeRegister(RF230_TRX_STATE, RF230_RX_ON); + writeRegister(RF2XX_TRX_STATE, RF2XX_RX_ON); state = STATE_RX_ON; } else { // the most likely place for clear channel (hope to avoid acks) - rssiClear += (readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK) - (rssiClear >> 2); + rssiClear += (readRegister(RF2XX_PHY_RSSI) & RF2XX_RSSI_MASK) - (rssiClear >> 2); } cmd = CMD_DOWNLOAD; diff --git a/tos/chips/rf230/RF230Packet.h b/tos/chips/rf230/RF2xxPacket.h similarity index 68% rename from tos/chips/rf230/RF230Packet.h rename to tos/chips/rf230/RF2xxPacket.h index f12e3e5b..d3b6898b 100644 --- a/tos/chips/rf230/RF230Packet.h +++ b/tos/chips/rf230/RF2xxPacket.h @@ -21,19 +21,19 @@ * Author: Miklos Maroti */ -#ifndef __RF230PACKET_H__ -#define __RF230PACKET_H__ +#ifndef __RF2XXPACKET_H__ +#define __RF2XXPACKET_H__ #include -typedef ieee154_header_t rf230packet_header_t; +typedef ieee154_header_t rf2xxpacket_header_t; -typedef nx_struct rf230packet_footer_t +typedef nx_struct rf2xxpacket_footer_t { // the time stamp is not recorded here, time stamped messaged cannot have max length -} rf230packet_footer_t; +} rf2xxpacket_footer_t; -typedef struct rf230packet_metadata_t +typedef struct rf2xxpacket_metadata_t { uint8_t flags; uint8_t lqi; @@ -42,18 +42,18 @@ typedef struct rf230packet_metadata_t uint16_t lpl_sleepint; #endif uint32_t timestamp; -} rf230packet_metadata_t; +} rf2xxpacket_metadata_t; -enum rf230packet_metadata_flags +enum rf2xxpacket_metadata_flags { - RF230PACKET_WAS_ACKED = 0x01, // PacketAcknowledgements - RF230PACKET_TIMESTAMP = 0x02, // PacketTimeStamp - RF230PACKET_TXPOWER = 0x04, // PacketTransmitPower - RF230PACKET_RSSI = 0x08, // PacketRSSI - RF230PACKET_TIMESYNC = 0x10, // PacketTimeSync (update timesync_footer) - RF230PACKET_LPL_SLEEPINT = 0x20, // LowPowerListening - - RF230PACKET_CLEAR_METADATA = 0x00, + RF2XXPACKET_WAS_ACKED = 0x01, // PacketAcknowledgements + RF2XXPACKET_TIMESTAMP = 0x02, // PacketTimeStamp + RF2XXPACKET_TXPOWER = 0x04, // PacketTransmitPower + RF2XXPACKET_RSSI = 0x08, // PacketRSSI + RF2XXPACKET_TIMESYNC = 0x10, // PacketTimeSync (update timesync_footer) + RF2XXPACKET_LPL_SLEEPINT = 0x20, // LowPowerListening + + RF2XXPACKET_CLEAR_METADATA = 0x00, }; -#endif//__RF230PACKET_H__ +#endif//__RF2XXPACKET_H__ diff --git a/tos/chips/rf230/RF230PacketC.nc b/tos/chips/rf230/RF2xxPacketC.nc similarity index 72% rename from tos/chips/rf230/RF230PacketC.nc rename to tos/chips/rf230/RF2xxPacketC.nc index 9d09b314..70b9add2 100644 --- a/tos/chips/rf230/RF230PacketC.nc +++ b/tos/chips/rf230/RF2xxPacketC.nc @@ -21,7 +21,7 @@ * Author: Miklos Maroti */ -configuration RF230PacketC +configuration RF2xxPacketC { provides { @@ -41,22 +41,22 @@ configuration RF230PacketC implementation { - components RF230PacketP, IEEE154PacketC, LocalTimeMicroC, LocalTimeMilliC; + components RF2xxPacketP, IEEE154PacketC, LocalTimeMicroC, LocalTimeMilliC; - RF230PacketP.IEEE154Packet -> IEEE154PacketC; - RF230PacketP.LocalTimeRadio -> LocalTimeMicroC; - RF230PacketP.LocalTimeMilli -> LocalTimeMilliC; + RF2xxPacketP.IEEE154Packet -> IEEE154PacketC; + RF2xxPacketP.LocalTimeRadio -> LocalTimeMicroC; + RF2xxPacketP.LocalTimeMilli -> LocalTimeMilliC; - Packet = RF230PacketP; + Packet = RF2xxPacketP; AMPacket = IEEE154PacketC; - PacketAcknowledgements = RF230PacketP; - PacketLinkQuality = RF230PacketP.PacketLinkQuality; - PacketTransmitPower = RF230PacketP.PacketTransmitPower; - PacketRSSI = RF230PacketP.PacketRSSI; - PacketSleepInterval = RF230PacketP.PacketSleepInterval; - PacketTimeSyncOffset = RF230PacketP.PacketTimeSyncOffset; + PacketAcknowledgements = RF2xxPacketP; + PacketLinkQuality = RF2xxPacketP.PacketLinkQuality; + PacketTransmitPower = RF2xxPacketP.PacketTransmitPower; + PacketRSSI = RF2xxPacketP.PacketRSSI; + PacketSleepInterval = RF2xxPacketP.PacketSleepInterval; + PacketTimeSyncOffset = RF2xxPacketP.PacketTimeSyncOffset; - PacketTimeStampRadio = RF230PacketP; - PacketTimeStampMilli = RF230PacketP; + PacketTimeStampRadio = RF2xxPacketP; + PacketTimeStampMilli = RF2xxPacketP; } diff --git a/tos/chips/rf230/RF230PacketP.nc b/tos/chips/rf230/RF2xxPacketP.nc similarity index 84% rename from tos/chips/rf230/RF230PacketP.nc rename to tos/chips/rf230/RF2xxPacketP.nc index 7a8d117a..5a727575 100644 --- a/tos/chips/rf230/RF230PacketP.nc +++ b/tos/chips/rf230/RF2xxPacketP.nc @@ -21,10 +21,10 @@ * Author: Miklos Maroti */ -#include +#include #include -module RF230PacketP +module RF2xxPacketP { provides { @@ -54,13 +54,13 @@ implementation enum { PACKET_LENGTH_INCREASE = - sizeof(rf230packet_header_t) - 1 // the 8-bit length field is not counted + sizeof(rf2xxpacket_header_t) - 1 // the 8-bit length field is not counted + sizeof(ieee154_footer_t), // the CRC is not stored in memory }; - inline rf230packet_metadata_t* getMeta(message_t* msg) + inline rf2xxpacket_metadata_t* getMeta(message_t* msg) { - return (rf230packet_metadata_t*)(msg->metadata); + return (rf2xxpacket_metadata_t*)(msg->metadata); } /*----------------- Packet -----------------*/ @@ -69,7 +69,7 @@ implementation { call IEEE154Packet.createDataFrame(msg); - getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA; + getMeta(msg)->flags = RF2XXPACKET_CLEAR_METADATA; } inline command void Packet.setPayloadLength(message_t* msg, uint8_t len) @@ -113,7 +113,7 @@ implementation async command bool PacketAcknowledgements.wasAcked(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_WAS_ACKED; + return getMeta(msg)->flags & RF2XXPACKET_WAS_ACKED; } /*----------------- PacketLinkQuality -----------------*/ @@ -141,7 +141,7 @@ implementation async command bool PacketTimeStampRadio.isValid(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_TIMESTAMP; + return getMeta(msg)->flags & RF2XXPACKET_TIMESTAMP; } async command uint32_t PacketTimeStampRadio.timestamp(message_t* msg) @@ -151,12 +151,12 @@ implementation async command void PacketTimeStampRadio.clear(message_t* msg) { - getMeta(msg)->flags &= ~RF230PACKET_TIMESTAMP; + getMeta(msg)->flags &= ~RF2XXPACKET_TIMESTAMP; } async command void PacketTimeStampRadio.set(message_t* msg, uint32_t value) { - getMeta(msg)->flags |= RF230PACKET_TIMESTAMP; + getMeta(msg)->flags |= RF2XXPACKET_TIMESTAMP; getMeta(msg)->timestamp = value; } @@ -192,7 +192,7 @@ implementation async command bool PacketTransmitPower.isSet(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_TXPOWER; + return getMeta(msg)->flags & RF2XXPACKET_TXPOWER; } async command uint8_t PacketTransmitPower.get(message_t* msg) @@ -202,13 +202,13 @@ implementation async command void PacketTransmitPower.clear(message_t* msg) { - getMeta(msg)->flags &= ~RF230PACKET_TXPOWER; + getMeta(msg)->flags &= ~RF2XXPACKET_TXPOWER; } async command void PacketTransmitPower.set(message_t* msg, uint8_t value) { - getMeta(msg)->flags &= ~RF230PACKET_RSSI; - getMeta(msg)->flags |= RF230PACKET_TXPOWER; + getMeta(msg)->flags &= ~RF2XXPACKET_RSSI; + getMeta(msg)->flags |= RF2XXPACKET_TXPOWER; getMeta(msg)->power = value; } @@ -216,7 +216,7 @@ implementation async command bool PacketRSSI.isSet(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_RSSI; + return getMeta(msg)->flags & RF2XXPACKET_RSSI; } async command uint8_t PacketRSSI.get(message_t* msg) @@ -226,13 +226,13 @@ implementation async command void PacketRSSI.clear(message_t* msg) { - getMeta(msg)->flags &= ~RF230PACKET_RSSI; + getMeta(msg)->flags &= ~RF2XXPACKET_RSSI; } async command void PacketRSSI.set(message_t* msg, uint8_t value) { - getMeta(msg)->flags &= ~RF230PACKET_TXPOWER; - getMeta(msg)->flags |= RF230PACKET_RSSI; + getMeta(msg)->flags &= ~RF2XXPACKET_TXPOWER; + getMeta(msg)->flags |= RF2XXPACKET_RSSI; getMeta(msg)->power = value; } @@ -240,7 +240,7 @@ implementation async command bool PacketTimeSyncOffset.isSet(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_TIMESYNC; + return getMeta(msg)->flags & RF2XXPACKET_TIMESYNC; } async command uint8_t PacketTimeSyncOffset.get(message_t* msg) @@ -250,20 +250,20 @@ implementation async command void PacketTimeSyncOffset.clear(message_t* msg) { - getMeta(msg)->flags &= ~RF230PACKET_TIMESYNC; + getMeta(msg)->flags &= ~RF2XXPACKET_TIMESYNC; } async command void PacketTimeSyncOffset.set(message_t* msg, uint8_t value) { // the value is ignored, the offset always points to the timesync footer at the end of the payload - getMeta(msg)->flags |= RF230PACKET_TIMESYNC; + getMeta(msg)->flags |= RF2XXPACKET_TIMESYNC; } /*----------------- PacketSleepInterval -----------------*/ async command bool PacketSleepInterval.isSet(message_t* msg) { - return getMeta(msg)->flags & RF230PACKET_LPL_SLEEPINT; + return getMeta(msg)->flags & RF2XXPACKET_LPL_SLEEPINT; } async command uint16_t PacketSleepInterval.get(message_t* msg) @@ -277,12 +277,12 @@ implementation async command void PacketSleepInterval.clear(message_t* msg) { - getMeta(msg)->flags &= ~RF230PACKET_LPL_SLEEPINT; + getMeta(msg)->flags &= ~RF2XXPACKET_LPL_SLEEPINT; } async command void PacketSleepInterval.set(message_t* msg, uint16_t value) { - getMeta(msg)->flags |= RF230PACKET_LPL_SLEEPINT; + getMeta(msg)->flags |= RF2XXPACKET_LPL_SLEEPINT; #ifdef LOW_POWER_LISTENING getMeta(msg)->lpl_sleepint = value; diff --git a/tos/chips/rf230/RF230TimeSyncMessageC.nc b/tos/chips/rf230/RF2xxTimeSyncMessageC.nc similarity index 63% rename from tos/chips/rf230/RF230TimeSyncMessageC.nc rename to tos/chips/rf230/RF2xxTimeSyncMessageC.nc index dc321af0..88da07e5 100644 --- a/tos/chips/rf230/RF230TimeSyncMessageC.nc +++ b/tos/chips/rf230/RF2xxTimeSyncMessageC.nc @@ -25,7 +25,7 @@ #include #include -configuration RF230TimeSyncMessageC +configuration RF2xxTimeSyncMessageC { provides { @@ -46,27 +46,27 @@ configuration RF230TimeSyncMessageC implementation { - components RF230TimeSyncMessageP, RF230ActiveMessageC, LocalTimeMilliC, LocalTimeMicroC as LocalTimeRadioC, RF230PacketC; + components RF2xxTimeSyncMessageP, RF2xxActiveMessageC, LocalTimeMilliC, LocalTimeMicroC as LocalTimeRadioC, RF2xxPacketC; - TimeSyncAMSendRadio = RF230TimeSyncMessageP; - TimeSyncPacketRadio = RF230TimeSyncMessageP; + TimeSyncAMSendRadio = RF2xxTimeSyncMessageP; + TimeSyncPacketRadio = RF2xxTimeSyncMessageP; - TimeSyncAMSendMilli = RF230TimeSyncMessageP; - TimeSyncPacketMilli = RF230TimeSyncMessageP; + TimeSyncAMSendMilli = RF2xxTimeSyncMessageP; + TimeSyncPacketMilli = RF2xxTimeSyncMessageP; - Packet = RF230TimeSyncMessageP; - RF230TimeSyncMessageP.SubSend -> RF230ActiveMessageC.AMSend; - RF230TimeSyncMessageP.SubPacket -> RF230ActiveMessageC.Packet; + Packet = RF2xxTimeSyncMessageP; + RF2xxTimeSyncMessageP.SubSend -> RF2xxActiveMessageC.AMSend; + RF2xxTimeSyncMessageP.SubPacket -> RF2xxActiveMessageC.Packet; - RF230TimeSyncMessageP.PacketTimeStampRadio -> RF230ActiveMessageC; - RF230TimeSyncMessageP.PacketTimeStampMilli -> RF230ActiveMessageC; - RF230TimeSyncMessageP.LocalTimeRadio -> LocalTimeRadioC; - RF230TimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC; + RF2xxTimeSyncMessageP.PacketTimeStampRadio -> RF2xxActiveMessageC; + RF2xxTimeSyncMessageP.PacketTimeStampMilli -> RF2xxActiveMessageC; + RF2xxTimeSyncMessageP.LocalTimeRadio -> LocalTimeRadioC; + RF2xxTimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC; - RF230TimeSyncMessageP.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset; + RF2xxTimeSyncMessageP.PacketTimeSyncOffset -> RF2xxPacketC.PacketTimeSyncOffset; - SplitControl = RF230ActiveMessageC; - Receive = RF230ActiveMessageC.Receive; - Snoop = RF230ActiveMessageC.Snoop; - AMPacket = RF230ActiveMessageC; + SplitControl = RF2xxActiveMessageC; + Receive = RF2xxActiveMessageC.Receive; + Snoop = RF2xxActiveMessageC.Snoop; + AMPacket = RF2xxActiveMessageC; } diff --git a/tos/chips/rf230/RF230TimeSyncMessageP.nc b/tos/chips/rf230/RF2xxTimeSyncMessageP.nc similarity index 99% rename from tos/chips/rf230/RF230TimeSyncMessageP.nc rename to tos/chips/rf230/RF2xxTimeSyncMessageP.nc index f60110a4..fd5dfc88 100644 --- a/tos/chips/rf230/RF230TimeSyncMessageP.nc +++ b/tos/chips/rf230/RF2xxTimeSyncMessageP.nc @@ -24,7 +24,7 @@ #include #include -module RF230TimeSyncMessageP +module RF2xxTimeSyncMessageP { provides { diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc index ef6a2c3d..f16da57a 100644 --- a/tos/platforms/iris/ActiveMessageC.nc +++ b/tos/platforms/iris/ActiveMessageC.nc @@ -43,7 +43,7 @@ configuration ActiveMessageC implementation { - components RF230ActiveMessageC as MAC; + components RF2xxActiveMessageC as MAC; SplitControl = MAC; AMSend = MAC; diff --git a/tos/platforms/iris/TimeSyncMessageC.nc b/tos/platforms/iris/TimeSyncMessageC.nc index c0f0a61e..4bca9f68 100644 --- a/tos/platforms/iris/TimeSyncMessageC.nc +++ b/tos/platforms/iris/TimeSyncMessageC.nc @@ -21,7 +21,7 @@ * Author: Miklos Maroti */ -#include +#include configuration TimeSyncMessageC { @@ -44,17 +44,17 @@ configuration TimeSyncMessageC implementation { - components RF230TimeSyncMessageC; + components RF2xxTimeSyncMessageC; - SplitControl = RF230TimeSyncMessageC; + SplitControl = RF2xxTimeSyncMessageC; - Receive = RF230TimeSyncMessageC.Receive; - Snoop = RF230TimeSyncMessageC.Snoop; - Packet = RF230TimeSyncMessageC; - AMPacket = RF230TimeSyncMessageC; + Receive = RF2xxTimeSyncMessageC.Receive; + Snoop = RF2xxTimeSyncMessageC.Snoop; + Packet = RF2xxTimeSyncMessageC; + AMPacket = RF2xxTimeSyncMessageC; - TimeSyncAMSendRadio = RF230TimeSyncMessageC; - TimeSyncPacketRadio = RF230TimeSyncMessageC; - TimeSyncAMSendMilli = RF230TimeSyncMessageC; - TimeSyncPacketMilli = RF230TimeSyncMessageC; + TimeSyncAMSendRadio = RF2xxTimeSyncMessageC; + TimeSyncPacketRadio = RF2xxTimeSyncMessageC; + TimeSyncAMSendMilli = RF2xxTimeSyncMessageC; + TimeSyncPacketMilli = RF2xxTimeSyncMessageC; } diff --git a/tos/platforms/iris/chips/rf230/HplRF230.h b/tos/platforms/iris/chips/rf230/HplRF2xx.h similarity index 77% rename from tos/platforms/iris/chips/rf230/HplRF230.h rename to tos/platforms/iris/chips/rf230/HplRF2xx.h index 63ae9db6..6f9e21c8 100644 --- a/tos/platforms/iris/chips/rf230/HplRF230.h +++ b/tos/platforms/iris/chips/rf230/HplRF2xx.h @@ -21,31 +21,36 @@ * Author: Miklos Maroti */ -#ifndef __HPLRF230_H__ -#define __HPLRF230_H__ +#ifndef __HPLRF2XX_H__ +#define __HPLRF2XX_H__ -#include +#include #include enum { + /** + * This is an RF230 chip + */ + RF2XX_CHIPSET = RF230_CHIPSET, + /** * This is the value of the TRX_CTRL_0 register * which configures the output pin currents and the CLKM clock */ - RF230_TRX_CTRL_0_VALUE = 0, + RF2XX_TRX_CTRL_0_VALUE = 0, /** * This is the default value of the CCA_MODE field in the PHY_CC_CCA register * which is used to configure the default mode of the clear channel assesment */ - RF230_CCA_MODE_VALUE = RF230_CCA_MODE_3, + RF2XX_CCA_MODE_VALUE = RF2XX_CCA_MODE_3, /** * This is the value of the CCA_THRES register that controls the * energy levels used for clear channel assesment */ - RF230_CCA_THRES_VALUE = 0xC7, + RF2XX_CCA_THRES_VALUE = 0xC7, }; /* This is the default value of the TX_PWR field of the PHY_TX_PWR register. */ @@ -53,15 +58,22 @@ enum #define RF230_DEF_RFPOWER 0 #endif +#define RF2XX_DEF_RFPOWER RF230_DEF_RFPOWER + /* This is the default value of the CHANNEL field of the PHY_CC_CCA register. */ #ifndef RF230_DEF_CHANNEL #define RF230_DEF_CHANNEL 11 #endif -// TODO: Check why the default crcByte implementation is in a different endianness -inline uint16_t RF230_CRCBYTE_COMMAND(uint16_t crc, uint8_t data) +#define RF2XX_DEF_CHANNEL RF230_DEF_CHANNEL + +/* + * This is the command used to calculate the CRC for the RF230 chip. + * TODO: Check why the default crcByte implementation is in a different endianness + */ +inline uint16_t RF2XX_CRCBYTE_COMMAND(uint16_t crc, uint8_t data) { return _crc_ccitt_update(crc, data); } -#endif//__HPLRF230_H__ +#endif//__HPLRF2XX_H__ diff --git a/tos/platforms/iris/chips/rf230/HplRF230C.nc b/tos/platforms/iris/chips/rf230/HplRF2xxC.nc similarity index 85% rename from tos/platforms/iris/chips/rf230/HplRF230C.nc rename to tos/platforms/iris/chips/rf230/HplRF2xxC.nc index 5ef56e04..cc3c1cf9 100644 --- a/tos/platforms/iris/chips/rf230/HplRF230C.nc +++ b/tos/platforms/iris/chips/rf230/HplRF2xxC.nc @@ -21,9 +21,9 @@ * Author: Miklos Maroti */ -#include +#include -configuration HplRF230C +configuration HplRF2xxC { provides { @@ -41,16 +41,16 @@ configuration HplRF230C implementation { - components HplRF230P; - IRQ = HplRF230P.IRQ; + components HplRF2xxP; + IRQ = HplRF2xxP.IRQ; - HplRF230P.PortCLKM -> IO.PortD6; - HplRF230P.PortIRQ -> IO.PortD4; + HplRF2xxP.PortCLKM -> IO.PortD6; + HplRF2xxP.PortIRQ -> IO.PortD4; components Atm128SpiC as SpiC; SpiResource = SpiC.Resource[unique("Atm128SpiC.Resource")]; - FastSpiByte = HplRF230P; + FastSpiByte = HplRF2xxP; components HplAtm128GeneralIOC as IO; SLP_TR = IO.PortB7; @@ -58,11 +58,11 @@ implementation SELN = IO.PortB0; components HplAtm128Timer1C as TimerC; - HplRF230P.Capture -> TimerC.Capture; + HplRF2xxP.Capture -> TimerC.Capture; components new AlarmOne16C() as AlarmC; Alarm = AlarmC; components RealMainP; - RealMainP.PlatformInit -> HplRF230P.PlatformInit; + RealMainP.PlatformInit -> HplRF2xxP.PlatformInit; } diff --git a/tos/platforms/iris/chips/rf230/HplRF230P.nc b/tos/platforms/iris/chips/rf230/HplRF2xxP.nc similarity index 98% rename from tos/platforms/iris/chips/rf230/HplRF230P.nc rename to tos/platforms/iris/chips/rf230/HplRF2xxP.nc index 652c60a7..a97f81c6 100644 --- a/tos/platforms/iris/chips/rf230/HplRF230P.nc +++ b/tos/platforms/iris/chips/rf230/HplRF2xxP.nc @@ -21,10 +21,9 @@ * Author: Miklos Maroti */ -#include #include "Atm128Spi.h" -module HplRF230P +module HplRF2xxP { provides { diff --git a/tos/platforms/iris/chips/rf230/RadioAlarm.h b/tos/platforms/iris/chips/rf230/RadioAlarm.h index 18976592..42b3d53c 100644 --- a/tos/platforms/iris/chips/rf230/RadioAlarm.h +++ b/tos/platforms/iris/chips/rf230/RadioAlarm.h @@ -32,8 +32,8 @@ typedef TOne TRadio; /** - * The number of radio alarm ticks per one microsecond (0.9216). We use integers - * and no parentheses just to make deputy happy. + * The number of radio alarm ticks per one microsecond (0.9216). + * We use integers and no parentheses just to make deputy happy. */ #define RADIO_ALARM_MICROSEC (7372800UL / MHZ / 32) * (1 << MICA_DIVIDE_ONE_FOR_32KHZ_LOG2) / 1000000UL diff --git a/tos/platforms/iris/platform_message.h b/tos/platforms/iris/platform_message.h index 9bc04c4a..cdf078ae 100644 --- a/tos/platforms/iris/platform_message.h +++ b/tos/platforms/iris/platform_message.h @@ -1,32 +1,3 @@ -/* $Id$ - * "Copyright (c) 2005 The Regents of the University of California. - * 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 UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF - * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * THE UNIVERSITY OF CALIFORNIA 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 UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." - * - * Copyright (c) 2002-2005 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ - /* * Copyright (c) 2007, Vanderbilt University * All rights reserved. @@ -49,33 +20,23 @@ * */ -/** - * Defining the platform-independently named packet structures to be the - * chip-specific CC1000 packet structures. - * - * @author Philip Levis - * @date May 16 2005 - * Revision: $Revision$ - */ - - #ifndef PLATFORM_MESSAGE_H #define PLATFORM_MESSAGE_H -#include +#include #include typedef union message_header { - rf230packet_header_t rf230; + rf2xxpacket_header_t rf2xx; serial_header_t serial; } message_header_t; typedef union message_footer { - rf230packet_footer_t rf230; + rf2xxpacket_footer_t rf2xx; } message_footer_t; typedef union message_metadata { - rf230packet_metadata_t rf230; + rf2xxpacket_metadata_t rf2xx; } message_metadata_t; #endif -- 2.39.2