[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/iris ActiveMessageC.nc, 1.9, 1.10 platform_message.h, 1.4, 1.5 TimeSyncMessageC.nc, 1.2, 1.3

[Miklos Maroti]

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

Modified Files:
	ActiveMessageC.nc platform_message.h TimeSyncMessageC.nc 
Log Message:
rename everything to support the RF212 

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/ActiveMessageC.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ActiveMessageC.nc	29 May 2008 18:57:53 -0000	1.9
--- ActiveMessageC.nc	8 Mar 2009 23:23:35 -0000	1.10
***************
*** 44,48 ****
  implementation
  {
! 	components RF230ActiveMessageC as MAC;
  
  	SplitControl = MAC;
--- 44,48 ----
  implementation
  {
! 	components RF2xxActiveMessageC as MAC;
  
  	SplitControl = MAC;

Index: platform_message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/platform_message.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** platform_message.h	16 May 2008 17:43:48 -0000	1.4
--- platform_message.h	8 Mar 2009 23:23:35 -0000	1.5
***************
*** 1,31 ****
- /* $Id$
-  * "Copyright (c) 2005 The Regents of the University  of California.  
-  * All rights reserved.
-  *
-  * Permission to use, copy, modify, and distribute this software and its
-  * documentation for any purpose, without fee, and without written agreement is
-  * hereby granted, provided that the above copyright notice, the following
-  * two paragraphs and the author appear in all copies of this software.
-  * 
-  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
-  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
-  * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  * 
-  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-  * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
-  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
-  *
-  * Copyright (c) 2002-2005 Intel Corporation
-  * All rights reserved.
-  *
-  * This file is distributed under the terms in the attached INTEL-LICENSE     
-  * file. If you do not find these files, copies can be found by writing to
-  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
-  * 94704.  Attention:  Intel License Inquiry.
-  */
- 
  /*
   * Copyright (c) 2007, Vanderbilt University
--- 1,2 ----
***************
*** 50,80 ****
   */
  
- /**
-  * Defining the platform-independently named packet structures to be the
-  * chip-specific CC1000 packet structures.
-  *
-  * @author Philip Levis
-  * @date   May 16 2005
-  * Revision:  $Revision$
-  */
- 
- 
  #ifndef PLATFORM_MESSAGE_H
  #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;
  
--- 21,41 ----
   */
  
  #ifndef PLATFORM_MESSAGE_H
  #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;
  

Index: TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/TimeSyncMessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TimeSyncMessageC.nc	22 Jan 2009 20:05:59 -0000	1.2
--- TimeSyncMessageC.nc	8 Mar 2009 23:23:35 -0000	1.3
***************
*** 22,26 ****
   */
  
! #include <HplRF230.h>
  
  configuration TimeSyncMessageC
--- 22,26 ----
   */
  
! #include <RadioAlarm.h>
  
  configuration TimeSyncMessageC
***************
*** 45,60 ****
  implementation
  {
! 	components RF230TimeSyncMessageC;
    
! 	SplitControl = RF230TimeSyncMessageC;
    
! 	Receive		= RF230TimeSyncMessageC.Receive;
! 	Snoop		= RF230TimeSyncMessageC.Snoop;
! 	Packet		= RF230TimeSyncMessageC;
! 	AMPacket	= RF230TimeSyncMessageC;
  
! 	TimeSyncAMSendRadio = RF230TimeSyncMessageC;
! 	TimeSyncPacketRadio = RF230TimeSyncMessageC;
! 	TimeSyncAMSendMilli = RF230TimeSyncMessageC;
! 	TimeSyncPacketMilli = RF230TimeSyncMessageC;
  }
--- 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;
  }