[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/iris ActiveMessageC.nc, 1.1, 1.2 MicaTimer.h, 1.1, 1.2 platform_message.h, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1572

Modified Files:
	ActiveMessageC.nc MicaTimer.h platform_message.h 
Log Message:
timesync support

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/ActiveMessageC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActiveMessageC.nc	5 Nov 2007 20:37:17 -0000	1.1
--- ActiveMessageC.nc	20 Feb 2008 01:07:04 -0000	1.2
***************
*** 33,37 ****
  		interface Packet;
  		interface AMPacket;
! 		interface PacketAcknowledgements as Acks;
  	}
  }
--- 33,41 ----
  		interface Packet;
  		interface AMPacket;
! 
! 		interface PacketAcknowledgements;
! 		interface PacketField<uint8_t> as PacketLinkQuality;
! 		interface PacketTimeStamp<TMicro, uint16_t>;
! 		interface PacketTimeSynch<TMicro, uint16_t>;
  	}
  }
***************
*** 47,55 ****
  	Packet       = MAC;
  	AMPacket     = MAC;
- 	Acks         = MAC;
  
! 	// TODO: do these from PlatformC
! //	components RealMainP, HplRF230C, RF230DriverC;
! //	RealMainP.PlatformInit -> HplRF230C.PlatformInit;
! //	RealMainP.PlatformInit -> RF230DriverC.PlatformInit;
  }
--- 51,58 ----
  	Packet       = MAC;
  	AMPacket     = MAC;
  
! 	PacketAcknowledgements = MAC;
! 	PacketLinkQuality = MAC;
! 	PacketTimeStamp = MAC;
! 	PacketTimeSynch = MAC;
  }

Index: MicaTimer.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/MicaTimer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MicaTimer.h	5 Nov 2007 20:37:17 -0000	1.1
--- MicaTimer.h	20 Feb 2008 01:07:04 -0000	1.2
***************
*** 145,149 ****
  // get a 1MHz (1 microsecond resolution) timer for debugging purposes
  
! typedef TMilli TOne;
  typedef TMicro TThree;
  typedef uint32_t counter_one_overflow_t;
--- 145,149 ----
  // get a 1MHz (1 microsecond resolution) timer for debugging purposes
  
! typedef TMicro TOne;
  typedef TMicro TThree;
  typedef uint32_t counter_one_overflow_t;

Index: platform_message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/platform_message.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** platform_message.h	19 Feb 2008 22:03:45 -0000	1.2
--- platform_message.h	20 Feb 2008 01:07:04 -0000	1.3
***************
*** 63,80 ****
  #define PLATFORM_MESSAGE_H
  
! #include <DefaultMac.h>
  #include <Serial.h>
  
  typedef union message_header {
!   defaultmac_header_t rf230;
!   serial_header_t serial;
  } message_header_t;
  
  typedef union message_footer {
  } message_footer_t;
  
  typedef union message_metadata {
!   defaultmac_metadata_t rf230;
!   serial_metadata_t serial;
  } message_metadata_t;
  
--- 63,80 ----
  #define PLATFORM_MESSAGE_H
  
! #include <DefaultPacket.h>
  #include <Serial.h>
  
  typedef union message_header {
! 	defpacket_header_t rf230;
! 	serial_header_t serial;
  } message_header_t;
  
  typedef union message_footer {
+ 	defpacket_footer_t rf230;
  } message_footer_t;
  
  typedef union message_metadata {
! 	defpacket_metadata_t rf230;
  } message_metadata_t;