From: mmaroti <mmaroti>
Date: Thu, 22 Jan 2009 20:04:37 +0000 (+0000)
Subject: rename the TRF230 timer to TRadio
X-Git-Tag: rc_6_tinyos_2_1_1~518
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=1313a9565528fdb46d6d07efc1646b5df2251313

rename the TRF230 timer to TRadio
---

diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
index 96a6fa7f..9b8e7141 100644
--- 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 4ba79fca..dac78439 100644
--- 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 dc4321b3..b8173616 100644
--- 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 09b49777..7a8d117a 100644
--- 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 70b6440d..e0693cb3 100644
--- 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 181d5c20..447b746f 100644
--- 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 a1b811d6..68f53d54 100644
--- 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 d712c6ef..537b76a7 100644
--- 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 e30af9ce..bd8e9b7b 100644
--- 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 aca670b3..c0f0a61e 100644
--- 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 4418ffea..0a69cea9 100644
--- 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 91962f7e..bb515895 100644
--- 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;
 	}