[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/iris .platform, 1.7, 1.8 ActiveMessageC.nc, 1.10, 1.11 TimeSyncMessageC.nc, 1.3, 1.4 platform_message.h, 1.5, 1.6

[Miklos Maroti]

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

Modified Files:
	.platform ActiveMessageC.nc TimeSyncMessageC.nc 
	platform_message.h 
Log Message:
moving files from rf230 to rf2xx, prepare the support of rf212

Index: .platform
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/.platform,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** .platform	31 Oct 2008 17:05:09 -0000	1.7
--- .platform	10 Mar 2009 20:39:18 -0000	1.8
***************
*** 14,19 ****
    %T/platforms/mica
    %T/platforms/iris/chips/rf230
!   %T/chips/rf230
!   %T/chips/cc2420
    %T/platforms/iris/chips/at45db
    %T/platforms/mica2/chips/at45db
--- 14,20 ----
    %T/platforms/mica
    %T/platforms/iris/chips/rf230
!   %T/chips/rf2xx/rf230
!   %T/chips/rf2xx/layers
!   %T/chips/rf2xx/util
    %T/platforms/iris/chips/at45db
    %T/platforms/mica2/chips/at45db

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/ActiveMessageC.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ActiveMessageC.nc	8 Mar 2009 23:23:35 -0000	1.10
--- ActiveMessageC.nc	10 Mar 2009 20:39:18 -0000	1.11
***************
*** 44,48 ****
  implementation
  {
! 	components RF2xxActiveMessageC as MAC;
  
  	SplitControl = MAC;
--- 44,48 ----
  implementation
  {
! 	components RF230ActiveMessageC as MAC;
  
  	SplitControl = MAC;
***************
*** 54,58 ****
  
  	PacketAcknowledgements	= MAC;
! 	LowPowerListening		= MAC;
  	PacketTimeStampMilli	= MAC;
  	PacketTimeStampMicro	= MAC;
--- 54,58 ----
  
  	PacketAcknowledgements	= MAC;
! 	LowPowerListening	= MAC;
  	PacketTimeStampMilli	= MAC;
  	PacketTimeStampMicro	= MAC;

Index: TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/TimeSyncMessageC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TimeSyncMessageC.nc	8 Mar 2009 23:23:35 -0000	1.3
--- TimeSyncMessageC.nc	10 Mar 2009 20:39:18 -0000	1.4
***************
*** 22,26 ****
   */
  
! #include <RadioAlarm.h>
  
  configuration TimeSyncMessageC
--- 22,26 ----
   */
  
! #include <RadioConfig.h>
  
  configuration TimeSyncMessageC
***************
*** 45,60 ****
  implementation
  {
! 	components RF2xxTimeSyncMessageC;
!   
! 	SplitControl = RF2xxTimeSyncMessageC;
    
! 	Receive		= RF2xxTimeSyncMessageC.Receive;
! 	Snoop		= RF2xxTimeSyncMessageC.Snoop;
! 	Packet		= RF2xxTimeSyncMessageC;
! 	AMPacket	= RF2xxTimeSyncMessageC;
  
! 	TimeSyncAMSendRadio = RF2xxTimeSyncMessageC;
! 	TimeSyncPacketRadio = RF2xxTimeSyncMessageC;
! 	TimeSyncAMSendMilli = RF2xxTimeSyncMessageC;
! 	TimeSyncPacketMilli = RF2xxTimeSyncMessageC;
  }
--- 45,62 ----
  implementation
  {
! 	components GenericTimeSyncMessageC as MAC, LocalTimeMicroC, RF230PacketC;
    
! 	SplitControl	= MAC;
!   	Receive		= MAC.Receive;
! 	Snoop		= MAC.Snoop;
! 	Packet		= MAC;
! 	AMPacket	= MAC;
  
! 	TimeSyncAMSendRadio	= MAC;
! 	TimeSyncPacketRadio	= MAC;
! 	TimeSyncAMSendMilli	= MAC;
! 	TimeSyncPacketMilli	= MAC;
! 
! 	MAC.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset;
! 	MAC.LocalTimeRadio -> LocalTimeMicroC;
  }

Index: platform_message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/platform_message.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** platform_message.h	8 Mar 2009 23:23:35 -0000	1.5
--- platform_message.h	10 Mar 2009 20:39:18 -0000	1.6
***************
*** 24,41 ****
  #define PLATFORM_MESSAGE_H
  
! #include <RF2xxPacket.h>
  #include <Serial.h>
  
  typedef union message_header {
! 	rf2xxpacket_header_t rf2xx;
  	serial_header_t serial;
  } message_header_t;
  
  typedef union message_footer {
! 	rf2xxpacket_footer_t rf2xx;
  } message_footer_t;
  
  typedef union message_metadata {
! 	rf2xxpacket_metadata_t rf2xx;
  } message_metadata_t;
  
--- 24,41 ----
  #define PLATFORM_MESSAGE_H
  
! #include <RF230Packet.h>
  #include <Serial.h>
  
  typedef union message_header {
! 	rf230packet_header_t rf230;
  	serial_header_t serial;
  } message_header_t;
  
  typedef union message_footer {
! 	rf230packet_footer_t rf230;
  } message_footer_t;
  
  typedef union message_metadata {
! 	rf230packet_metadata_t rf230;
  } message_metadata_t;