rename the TRF230 timer to TRadio

diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
index 96a6fa7f3fd313027e7def7303da868940fac47a..9b8e714162c7c482464c20f130a32a724721b843 100644 (file)
--- a/tos/chips/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf230/RF230ActiveMessageC.nc
@@ -42,7 +42,7 @@ configuration RF230ActiveMessageC
                interface PacketField<uint8_t> as PacketTransmitPower;
                interface PacketField<uint8_t> as PacketRSSI;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 }

diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF230LayerP.nc
index 4ba79fca8bf74f60d948f3f78c71a38f29e0186e..dac7843912cef78dad90011c6f7b35fe716fe547 100644 (file)
--- a/tos/chips/rf230/RF230LayerP.nc
+++ b/tos/chips/rf230/RF230LayerP.nc
@@ -60,8 +60,8 @@ module RF230LayerP
                interface PacketField<uint8_t> as PacketRSSI;
                interface PacketField<uint8_t> as PacketTimeSyncOffset;
 
-               interface PacketTimeStamp<TRF230, uint32_t>;
-               interface LocalTime<TRF230>;
+               interface PacketTimeStamp<TRadio, uint32_t>;
+               interface LocalTime<TRadio>;
 
                interface RF230Config;
                interface Tasklet;

diff --git a/tos/chips/rf230/RF230PacketC.nc b/tos/chips/rf230/RF230PacketC.nc
index dc4321b3d8c7f948b3b3e727dec0056ad4520749..b8173616cd648c4dccc03b8762dc1d101338dcb0 100644 (file)
--- a/tos/chips/rf230/RF230PacketC.nc
+++ b/tos/chips/rf230/RF230PacketC.nc
@@ -36,7 +36,7 @@ configuration RF230PacketC
                interface PacketField<uint16_t> as PacketSleepInterval;
                interface PacketField<uint8_t> as PacketTimeSyncOffset;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 }

diff --git a/tos/chips/rf230/RF230PacketP.nc b/tos/chips/rf230/RF230PacketP.nc
index 09b4977742ddd71ab9ac07418c0113af2ae52ba6..7a8d117ad2d6b5a70d7540b992bf7dafba65f71c 100644 (file)
--- a/tos/chips/rf230/RF230PacketP.nc
+++ b/tos/chips/rf230/RF230PacketP.nc
@@ -36,7 +36,7 @@ module RF230PacketP
                interface PacketField<uint16_t> as PacketSleepInterval;
                interface PacketField<uint8_t> as PacketTimeSyncOffset;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 
@@ -44,7 +44,7 @@ module RF230PacketP
        {
                interface IEEE154Packet;
 
-               interface LocalTime<TRF230> as LocalTimeRadio;
+               interface LocalTime<TRadio> as LocalTimeRadio;
                interface LocalTime<TMilli> as LocalTimeMilli;
        }
 }

diff --git a/tos/chips/rf230/RF230TimeSyncMessageC.nc b/tos/chips/rf230/RF230TimeSyncMessageC.nc
index 70b6440df643f40cc9d64ec5d553a44b5d2e37f4..e0693cb35bfbd703f22fc88764ad9dd901af896e 100644 (file)
--- a/tos/chips/rf230/RF230TimeSyncMessageC.nc
+++ b/tos/chips/rf230/RF230TimeSyncMessageC.nc
@@ -36,8 +36,8 @@ configuration RF230TimeSyncMessageC
                interface Packet;
                interface AMPacket;
 
-               interface TimeSyncAMSend<TRF230, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
-               interface TimeSyncPacket<TRF230, uint32_t> as TimeSyncPacketRadio;
+               interface TimeSyncAMSend<TRadio, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
+               interface TimeSyncPacket<TRadio, uint32_t> as TimeSyncPacketRadio;
 
                interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[am_id_t id];
                interface TimeSyncPacket<TMilli, uint32_t> as TimeSyncPacketMilli;

diff --git a/tos/chips/rf230/RF230TimeSyncMessageP.nc b/tos/chips/rf230/RF230TimeSyncMessageP.nc
index 181d5c206eace908ea092ab5d993ff11bd5d5027..447b746f6e6854ed329e6b21696be613eaa6b35c 100644 (file)
--- a/tos/chips/rf230/RF230TimeSyncMessageP.nc
+++ b/tos/chips/rf230/RF230TimeSyncMessageP.nc
@@ -28,11 +28,11 @@ module RF230TimeSyncMessageP
 {
        provides
        {
-               interface TimeSyncAMSend<TRF230, uint32_t> as TimeSyncAMSendRadio[uint8_t id];
+               interface TimeSyncAMSend<TRadio, uint32_t> as TimeSyncAMSendRadio[uint8_t id];
                interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[uint8_t id];
                interface Packet;
 
-               interface TimeSyncPacket<TRF230, uint32_t> as TimeSyncPacketRadio;
+               interface TimeSyncPacket<TRadio, uint32_t> as TimeSyncPacketRadio;
                interface TimeSyncPacket<TMilli, uint32_t> as TimeSyncPacketMilli;
        }
 
@@ -41,10 +41,10 @@ module RF230TimeSyncMessageP
                interface AMSend as SubSend[uint8_t id];
                interface Packet as SubPacket;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
 
-               interface LocalTime<TRF230> as LocalTimeRadio;
+               interface LocalTime<TRadio> as LocalTimeRadio;
                interface LocalTime<TMilli> as LocalTimeMilli;
 
                interface PacketField<uint8_t> as PacketTimeSyncOffset;

diff --git a/tos/chips/rf230/RadioAlarmC.nc b/tos/chips/rf230/RadioAlarmC.nc
index a1b811d69a927c950c92ed226b18098a63ca8a76..68f53d541a52ddee1dd614c0fd839fcb620c3c84 100644 (file)
--- a/tos/chips/rf230/RadioAlarmC.nc
+++ b/tos/chips/rf230/RadioAlarmC.nc
@@ -30,7 +30,7 @@ configuration RadioAlarmC
 
        uses
        {
-               interface Alarm<TRF230, uint16_t> @exactlyonce();
+               interface Alarm<TRadio, uint16_t> @exactlyonce();
        }
 }
 

diff --git a/tos/chips/rf230/RadioAlarmP.nc b/tos/chips/rf230/RadioAlarmP.nc
index d712c6ef9e3e7824db6b0fba8dbdf24679c34677..537b76a7ce4e03b9374b16d9af9b22e44c281734 100644 (file)
--- a/tos/chips/rf230/RadioAlarmP.nc
+++ b/tos/chips/rf230/RadioAlarmP.nc
@@ -33,7 +33,7 @@ module RadioAlarmP
 
        uses
        {
-               interface Alarm<TRF230, uint16_t>;
+               interface Alarm<TRadio, uint16_t>;
                interface Tasklet;
        }
 }

diff --git a/tos/lib/tosthreads/chips/rf230/RF230ActiveMessageC.nc b/tos/lib/tosthreads/chips/rf230/RF230ActiveMessageC.nc
index e30af9ceb39a0bed24ac8da35c07c88cfb774299..bd8e9b7b0275fe691761815a6fe0cb295abc9de2 100644 (file)
--- a/tos/lib/tosthreads/chips/rf230/RF230ActiveMessageC.nc
+++ b/tos/lib/tosthreads/chips/rf230/RF230ActiveMessageC.nc
@@ -44,7 +44,7 @@ configuration RF230ActiveMessageC
                interface PacketField<uint8_t> as PacketTransmitPower;
                interface PacketField<uint8_t> as PacketRSSI;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 }

diff --git a/tos/platforms/iris/TimeSyncMessageC.nc b/tos/platforms/iris/TimeSyncMessageC.nc
index aca670b3732831ec602436d809aa0132a77e9d08..c0f0a61e14b42aa9054f4e0196e0a88b13894d5d 100644 (file)
--- a/tos/platforms/iris/TimeSyncMessageC.nc
+++ b/tos/platforms/iris/TimeSyncMessageC.nc
@@ -34,8 +34,8 @@ configuration TimeSyncMessageC
                interface Packet;
                interface AMPacket;
 
-               interface TimeSyncAMSend<TRF230, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
-               interface TimeSyncPacket<TRF230, uint32_t> as TimeSyncPacketRadio;
+               interface TimeSyncAMSend<TRadio, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
+               interface TimeSyncPacket<TRadio, uint32_t> as TimeSyncPacketRadio;
 
                interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[am_id_t id];
                interface TimeSyncPacket<TMilli, uint32_t> as TimeSyncPacketMilli;

diff --git a/tos/platforms/iris/chips/rf230/HplRF230.h b/tos/platforms/iris/chips/rf230/HplRF230.h
index 4418ffea859a57e4039e05996ab8e213e711f31c..0a69cea9f1ca3e88272cbdf755e67ee812dced76 100644 (file)
--- a/tos/platforms/iris/chips/rf230/HplRF230.h
+++ b/tos/platforms/iris/chips/rf230/HplRF230.h
@@ -50,7 +50,7 @@ enum
 /**
  * This is the timer type of the RF230 alarm interface
  */
-typedef TOne TRF230;
+typedef TOne TRadio;
 
 
 /**

diff --git a/tos/platforms/iris/chips/rf230/HplRF230C.nc b/tos/platforms/iris/chips/rf230/HplRF230C.nc
index 91962f7ea93d366f6f3cc12b3033be748c73693c..bb5158956dc3ec2a084b20d52306f4a9d86b3f28 100644 (file)
--- a/tos/platforms/iris/chips/rf230/HplRF230C.nc
+++ b/tos/platforms/iris/chips/rf230/HplRF230C.nc
@@ -35,7 +35,7 @@ configuration HplRF230C
                interface GeneralIO as RSTN;
 
                interface GpioCapture as IRQ;
-               interface Alarm<TRF230, uint16_t> as Alarm;
+               interface Alarm<TRadio, uint16_t> as Alarm;
 
                interface HplRF230;
        }