[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 RadioAlarmC.nc, 1.1, 1.2 RadioAlarmP.nc, 1.1, 1.2 RF230ActiveMessageC.nc, 1.4, 1.5 RF230LayerP.nc, 1.20, 1.21 RF230PacketC.nc, 1.2, 1.3 RF230PacketP.nc, 1.5, 1.6 RF230TimeSyncMessageC.nc, 1.1, 1.2 RF230TimeSyncMessageP.nc, 1.1, 1.2

Miklos Maroti mmaroti at users.sourceforge.net
Thu Jan 22 12:04:39 PST 2009


Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22042

Modified Files:
	RadioAlarmC.nc RadioAlarmP.nc RF230ActiveMessageC.nc 
	RF230LayerP.nc RF230PacketC.nc RF230PacketP.nc 
	RF230TimeSyncMessageC.nc RF230TimeSyncMessageP.nc 
Log Message:
rename the TRF230 timer to TRadio

Index: RadioAlarmC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RadioAlarmC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioAlarmC.nc	5 Nov 2007 20:36:56 -0000	1.1
--- RadioAlarmC.nc	22 Jan 2009 20:04:37 -0000	1.2
***************
*** 31,35 ****
  	uses
  	{
! 		interface Alarm<TRF230, uint16_t> @exactlyonce();
  	}
  }
--- 31,35 ----
  	uses
  	{
! 		interface Alarm<TRadio, uint16_t> @exactlyonce();
  	}
  }

Index: RadioAlarmP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RadioAlarmP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioAlarmP.nc	5 Nov 2007 20:36:56 -0000	1.1
--- RadioAlarmP.nc	22 Jan 2009 20:04:37 -0000	1.2
***************
*** 34,38 ****
  	uses
  	{
! 		interface Alarm<TRF230, uint16_t>;
  		interface Tasklet;
  	}
--- 34,38 ----
  	uses
  	{
! 		interface Alarm<TRadio, uint16_t>;
  		interface Tasklet;
  	}

Index: RF230ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230ActiveMessageC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RF230ActiveMessageC.nc	17 Jun 2008 18:18:49 -0000	1.4
--- RF230ActiveMessageC.nc	22 Jan 2009 20:04:37 -0000	1.5
***************
*** 43,47 ****
  		interface PacketField<uint8_t> as PacketRSSI;
  
! 		interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}
--- 43,47 ----
  		interface PacketField<uint8_t> as PacketRSSI;
  
! 		interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}

Index: RF230LayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerP.nc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RF230LayerP.nc	27 Jun 2008 23:33:37 -0000	1.20
--- RF230LayerP.nc	22 Jan 2009 20:04:37 -0000	1.21
***************
*** 61,66 ****
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRF230, uint32_t>;
! 		interface LocalTime<TRF230>;
  
  		interface RF230Config;
--- 61,66 ----
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRadio, uint32_t>;
! 		interface LocalTime<TRadio>;
  
  		interface RF230Config;

Index: RF230PacketC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230PacketC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230PacketC.nc	29 May 2008 18:57:53 -0000	1.2
--- RF230PacketC.nc	22 Jan 2009 20:04:37 -0000	1.3
***************
*** 37,41 ****
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}
--- 37,41 ----
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}

Index: RF230PacketP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230PacketP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RF230PacketP.nc	17 Jun 2008 09:29:59 -0000	1.5
--- RF230PacketP.nc	22 Jan 2009 20:04:37 -0000	1.6
***************
*** 37,41 ****
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}
--- 37,41 ----
  		interface PacketField<uint8_t> as PacketTimeSyncOffset;
  
! 		interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  	}
***************
*** 45,49 ****
  		interface IEEE154Packet;
  
! 		interface LocalTime<TRF230> as LocalTimeRadio;
  		interface LocalTime<TMilli> as LocalTimeMilli;
  	}
--- 45,49 ----
  		interface IEEE154Packet;
  
! 		interface LocalTime<TRadio> as LocalTimeRadio;
  		interface LocalTime<TMilli> as LocalTimeMilli;
  	}

Index: RF230TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230TimeSyncMessageC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230TimeSyncMessageC.nc	16 Jun 2008 19:04:25 -0000	1.1
--- RF230TimeSyncMessageC.nc	22 Jan 2009 20:04:37 -0000	1.2
***************
*** 37,42 ****
  		interface AMPacket;
  
! 		interface TimeSyncAMSend<TRF230, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
! 		interface TimeSyncPacket<TRF230, uint32_t> as TimeSyncPacketRadio;
  
  		interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[am_id_t id];
--- 37,42 ----
  		interface AMPacket;
  
! 		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];

Index: RF230TimeSyncMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230TimeSyncMessageP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230TimeSyncMessageP.nc	16 Jun 2008 19:04:25 -0000	1.1
--- RF230TimeSyncMessageP.nc	22 Jan 2009 20:04:37 -0000	1.2
***************
*** 29,37 ****
  	provides
  	{
! 		interface TimeSyncAMSend<TRF230, 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<TMilli, uint32_t> as TimeSyncPacketMilli;
  	}
--- 29,37 ----
  	provides
  	{
! 		interface TimeSyncAMSend<TRadio, uint32_t> as TimeSyncAMSendRadio[uint8_t id];
  		interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[uint8_t id];
  		interface Packet;
  
! 		interface TimeSyncPacket<TRadio, uint32_t> as TimeSyncPacketRadio;
  		interface TimeSyncPacket<TMilli, uint32_t> as TimeSyncPacketMilli;
  	}
***************
*** 42,49 ****
  		interface Packet as SubPacket;
  
! 		interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  
! 		interface LocalTime<TRF230> as LocalTimeRadio;
  		interface LocalTime<TMilli> as LocalTimeMilli;
  
--- 42,49 ----
  		interface Packet as SubPacket;
  
! 		interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
  		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
  
! 		interface LocalTime<TRadio> as LocalTimeRadio;
  		interface LocalTime<TMilli> as LocalTimeMilli;
  



More information about the Tinyos-2-commits mailing list