[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 TimeSyncMessageC.nc, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3082/chips/rf230

Modified Files:
	TimeSyncMessageC.nc 
Log Message:
IRIS: remove platform specific interfaces from ActiveMessageC

Index: TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/TimeSyncMessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TimeSyncMessageC.nc	29 Mar 2008 20:10:33 -0000	1.2
--- TimeSyncMessageC.nc	16 May 2008 18:45:37 -0000	1.3
***************
*** 29,32 ****
--- 29,39 ----
  	provides
  	{
+ 		interface SplitControl;
+ 
+ 		interface Receive[uint8_t id];
+ 		interface Receive as Snoop[am_id_t id];
+ 		interface Packet;
+ 		interface AMPacket;
+ 
  		interface TimeSyncSend<TMicro> as TimeSyncSendMicro[am_id_t id];
  		interface TimeSyncPacket<TMicro> as TimeSyncPacketMicro;
***************
*** 37,46 ****
  		interface LocalTime<TMilli> as LocalTimeMilli;
  
! 		interface SplitControl;
! 		interface Receive[uint8_t id];
! 		interface Receive as Snoop[am_id_t id];
! 		interface Packet;
! 		interface AMPacket;
! 		interface PacketAcknowledgements;
  	}
  }
--- 44,48 ----
  		interface LocalTime<TMilli> as LocalTimeMilli;
  
! 		interface PacketTimeStamp<TMicro, uint16_t>;
  	}
  }
***************
*** 48,52 ****
  implementation
  {
! 	components TimeSyncMessageP, ActiveMessageC, LocalTimeMilliC;
  
  	TimeSyncSendMicro = TimeSyncMessageP;
--- 50,54 ----
  implementation
  {
! 	components TimeSyncMessageP, RF230ActiveMessageC, LocalTimeMilliC;
  
  	TimeSyncSendMicro = TimeSyncMessageP;
***************
*** 59,74 ****
  
  	Packet = TimeSyncMessageP;
! 	TimeSyncMessageP.SubSend -> ActiveMessageC.AMSend;
! 	TimeSyncMessageP.SubPacket -> ActiveMessageC.Packet;
! 	TimeSyncMessageP.PacketTimeStamp -> ActiveMessageC;
  
  	TimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC;
  
! 	TimeSyncMessageP.PacketLastTouch -> ActiveMessageC;
  
! 	SplitControl = ActiveMessageC;
! 	Receive	= ActiveMessageC.Receive;
! 	Snoop = ActiveMessageC.Snoop;
! 	AMPacket = ActiveMessageC;
! 	PacketAcknowledgements = ActiveMessageC;
  }
--- 61,76 ----
  
  	Packet = TimeSyncMessageP;
! 	TimeSyncMessageP.SubSend -> RF230ActiveMessageC.AMSend;
! 	TimeSyncMessageP.SubPacket -> RF230ActiveMessageC.Packet;
! 	TimeSyncMessageP.PacketTimeStamp -> RF230ActiveMessageC;
  
  	TimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC;
  
! 	TimeSyncMessageP.PacketLastTouch -> RF230ActiveMessageC;
  
! 	SplitControl = RF230ActiveMessageC;
! 	Receive	= RF230ActiveMessageC.Receive;
! 	Snoop = RF230ActiveMessageC.Snoop;
! 	AMPacket = RF230ActiveMessageC;
! 	PacketTimeStamp = RF230ActiveMessageC;
  }