[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/iris ActiveMessageC.nc, 1.11, 1.12 TimeSyncMessageC.nc, 1.5, 1.6

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6977

Modified Files:
	ActiveMessageC.nc TimeSyncMessageC.nc 
Log Message:
move/create RF2xxTimeSyncMessageC to avoid future changes in platforms

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/ActiveMessageC.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ActiveMessageC.nc	10 Mar 2009 20:39:18 -0000	1.11
--- ActiveMessageC.nc	9 Apr 2009 21:27:15 -0000	1.12
***************
*** 36,39 ****
--- 36,42 ----
  		interface PacketAcknowledgements;
  		interface LowPowerListening;
+ #ifdef PACKET_LINK
+ 		interface PacketLink;
+ #endif
  
  		interface PacketTimeStamp<TMicro, uint32_t> as PacketTimeStampMicro;
***************
*** 46,55 ****
  	components RF230ActiveMessageC as MAC;
  
! 	SplitControl = MAC;
! 	AMSend       = MAC;
! 	Receive      = MAC.Receive;
! 	Snoop        = MAC.Snoop;
! 	Packet       = MAC;
! 	AMPacket     = MAC;
  
  	PacketAcknowledgements	= MAC;
--- 49,61 ----
  	components RF230ActiveMessageC as MAC;
  
! 	SplitControl	= MAC;
! 	AMSend		= MAC;
! 	Receive		= MAC.Receive;
! 	Snoop		= MAC.Snoop;
! 	Packet		= MAC;
! 	AMPacket	= MAC;
! #ifdef PACKET_LINK
! 	PacketLink	= MAC;
! #endif
  
  	PacketAcknowledgements	= MAC;

Index: TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/TimeSyncMessageC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TimeSyncMessageC.nc	2 Apr 2009 22:11:01 -0000	1.5
--- TimeSyncMessageC.nc	9 Apr 2009 21:27:16 -0000	1.6
***************
*** 45,49 ****
  implementation
  {
! 	components GenericTimeSyncMessageC as MAC, LocalTimeMicroC, RF230DriverLayerC;
    
  	SplitControl	= MAC;
--- 45,49 ----
  implementation
  {
! 	components RF230TimeSyncMessageC as MAC;
    
  	SplitControl	= MAC;
***************
*** 57,62 ****
  	TimeSyncAMSendMilli	= MAC;
  	TimeSyncPacketMilli	= MAC;
- 
- 	MAC.PacketTimeSyncOffset -> RF230DriverLayerC.PacketTimeSyncOffset;
- 	MAC.LocalTimeRadio -> LocalTimeMicroC;
  }
--- 57,59 ----