[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 RF230ActiveMessageC.nc, 1.7, 1.8 RF230ActiveMessageP.nc, 1.2, 1.3 RF230LayerC.nc, 1.8, 1.9 RF230LayerP.nc, 1.24, 1.25 RF230PacketC.nc, 1.3, 1.4 RF230TimeSyncMessageC.nc, 1.2, 1.3 RF230TimeSyncMessageP.nc, 1.2, 1.3 HplRF230.nc, 1.1, NONE

Sun Mar 8 15:02:41 PDT 2009

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8961

Modified Files:
	RF230ActiveMessageC.nc RF230ActiveMessageP.nc RF230LayerC.nc 
	RF230LayerP.nc RF230PacketC.nc RF230TimeSyncMessageC.nc 
	RF230TimeSyncMessageP.nc 
Removed Files:
	HplRF230.nc 
Log Message:
Prepare to support the RF212 chip (reorganization of timer and HPL constants)

Index: RF230ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230ActiveMessageC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RF230ActiveMessageC.nc	25 Feb 2009 20:44:01 -0000	1.7
--- RF230ActiveMessageC.nc	8 Mar 2009 22:02:38 -0000	1.8
***************
*** 22,26 ****
   */

! #include <HplRF230.h>

  configuration RF230ActiveMessageC
--- 22,26 ----
   */

! #include <RadioAlarm.h>

  configuration RF230ActiveMessageC

Index: RF230ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230ActiveMessageP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230ActiveMessageP.nc	27 Jun 2008 23:33:37 -0000	1.2
--- RF230ActiveMessageP.nc	8 Mar 2009 22:02:38 -0000	1.3
***************
*** 23,27 ****

  #include <RF230Packet.h>
! #include <HplRF230.h>
  #include <Tasklet.h>

--- 23,27 ----

  #include <RF230Packet.h>
! #include <RadioAlarm.h>
  #include <Tasklet.h>

***************
*** 132,136 ****
  	async command uint16_t SoftwareAckConfig.getAckTimeout()
  	{
! 		return (uint16_t)(800 * RF230_ALARM_MICROSEC);
  	}

--- 132,136 ----
  	async command uint16_t SoftwareAckConfig.getAckTimeout()
  	{
! 		return (uint16_t)(800 * RADIO_ALARM_MICROSEC);
  	}

***************
*** 229,243 ****
  	async command uint16_t RandomCollisionConfig.getMinimumBackoff()
  	{
! 		return (uint16_t)(320 * RF230_ALARM_MICROSEC);
  	}

  	async command uint16_t RandomCollisionConfig.getInitialBackoff(message_t* msg)
  	{
! 		return (uint16_t)(9920 * RF230_ALARM_MICROSEC);
  	}

  	async command uint16_t RandomCollisionConfig.getCongestionBackoff(message_t* msg)
  	{
! 		return (uint16_t)(2240 * RF230_ALARM_MICROSEC);
  	}

--- 229,243 ----
  	async command uint16_t RandomCollisionConfig.getMinimumBackoff()
  	{
! 		return (uint16_t)(320 * RADIO_ALARM_MICROSEC);
  	}

  	async command uint16_t RandomCollisionConfig.getInitialBackoff(message_t* msg)
  	{
! 		return (uint16_t)(9920 * RADIO_ALARM_MICROSEC);
  	}

  	async command uint16_t RandomCollisionConfig.getCongestionBackoff(message_t* msg)
  	{
! 		return (uint16_t)(2240 * RADIO_ALARM_MICROSEC);
  	}

***************
*** 251,257 ****
  		// estimated response time (download the message, etc) is 5-8 bytes
  		if( call IEEE154Packet.requiresAckReply(msg) )
! 			time += (uint16_t)(32 * (-5 + 16 + 11 + 5) * RF230_ALARM_MICROSEC);
  		else
! 			time += (uint16_t)(32 * (-5 + 5) * RF230_ALARM_MICROSEC);

  		return time;
--- 251,257 ----
  		// estimated response time (download the message, etc) is 5-8 bytes
  		if( call IEEE154Packet.requiresAckReply(msg) )
! 			time += (uint16_t)(32 * (-5 + 16 + 11 + 5) * RADIO_ALARM_MICROSEC);
  		else
! 			time += (uint16_t)(32 * (-5 + 5) * RADIO_ALARM_MICROSEC);

  		return time;
***************
*** 281,290 ****
  	{
  		// the preamble (4 bytes), SFD (1 byte), plus two extra for safety
! 		return getMeta(msg)->timestamp - (uint16_t)(7 * 32 * RF230_ALARM_MICROSEC);
  	}

  	async command uint16_t SlottedCollisionConfig.getCollisionWindowLength(message_t* msg)
  	{
! 		return (uint16_t)(2 * 7 * 32 * RF230_ALARM_MICROSEC);
  	}

--- 281,290 ----
  	{
  		// the preamble (4 bytes), SFD (1 byte), plus two extra for safety
! 		return getMeta(msg)->timestamp - (uint16_t)(7 * 32 * RADIO_ALARM_MICROSEC);
  	}

  	async command uint16_t SlottedCollisionConfig.getCollisionWindowLength(message_t* msg)
  	{
! 		return (uint16_t)(2 * 7 * 32 * RADIO_ALARM_MICROSEC);
  	}

Index: RF230LayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerC.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RF230LayerC.nc	6 Mar 2009 13:12:11 -0000	1.8
--- RF230LayerC.nc	8 Mar 2009 22:02:38 -0000	1.9
***************
*** 22,27 ****
   */

- #include <HplRF230.h>
- 
  configuration RF230LayerC
  {
--- 22,25 ----
***************
*** 61,65 ****
  	RF230LayerP.SpiResource -> HplRF230C.SpiResource;
  	RF230LayerP.FastSpiByte -> HplRF230C;
- 	RF230LayerP.HplRF230 -> HplRF230C;

  	RF230LayerP.SLP_TR -> HplRF230C.SLP_TR;
--- 59,62 ----

Index: RF230LayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerP.nc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** RF230LayerP.nc	6 Mar 2009 13:12:11 -0000	1.24
--- RF230LayerP.nc	8 Mar 2009 22:02:38 -0000	1.25
***************
*** 27,30 ****
--- 27,31 ----
  #include <RadioAssert.h>
  #include <TimeSyncMessage.h>
+ #include <RadioAlarm.h>

  module RF230LayerP
***************
*** 47,51 ****

  		interface FastSpiByte;
- 		interface HplRF230;

  		interface GeneralIO as SLP_TR;
--- 48,51 ----
***************
*** 151,159 ****
  	enum
  	{
! 		SLEEP_WAKEUP_TIME = (uint16_t)(880 * RF230_ALARM_SEC / 1000000UL),
! 		CCA_REQUEST_TIME = (uint16_t)(140 * RF230_ALARM_SEC / 1000000UL),

! 		TX_SFD_DELAY = (uint16_t)(176 * RF230_ALARM_SEC / 1000000UL),
! 		RX_SFD_DELAY = (uint16_t)(8 * RF230_ALARM_SEC / 1000000UL),
  	};

--- 151,159 ----
  	enum
  	{
! 		SLEEP_WAKEUP_TIME = (uint16_t)(880 * RADIO_ALARM_MICROSEC),
! 		CCA_REQUEST_TIME = (uint16_t)(140 * RADIO_ALARM_MICROSEC),

! 		TX_SFD_DELAY = (uint16_t)(176 * RADIO_ALARM_MICROSEC),
! 		RX_SFD_DELAY = (uint16_t)(8 * RADIO_ALARM_MICROSEC),
  	};

***************
*** 581,585 ****

  			do {
! 				crc = call HplRF230.crcByte(crc, *(data++) = call FastSpiByte.splitReadWrite(0));
  			}
  			while( --read != 0  );
--- 581,585 ----

  			do {
! 				crc = RF230_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0));
  			}
  			while( --read != 0  );
***************
*** 588,595 ****
  			{
  				while( length-- != 0 )
! 					crc = call HplRF230.crcByte(crc, *(data++) = call FastSpiByte.splitReadWrite(0));

! 				crc = call HplRF230.crcByte(crc, call FastSpiByte.splitReadWrite(0));
! 				crc = call HplRF230.crcByte(crc, call FastSpiByte.splitReadWrite(0));

  				call PacketLinkQuality.set(rxMsg, call FastSpiByte.splitRead());
--- 588,595 ----
  			{
  				while( length-- != 0 )
! 					crc = RF230_CRCBYTE_COMMAND(crc, *(data++) = call FastSpiByte.splitReadWrite(0));

! 				crc = RF230_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0));
! 				crc = RF230_CRCBYTE_COMMAND(crc, call FastSpiByte.splitReadWrite(0));

  				call PacketLinkQuality.set(rxMsg, call FastSpiByte.splitRead());

Index: RF230PacketC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230PacketC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RF230PacketC.nc	22 Jan 2009 20:04:37 -0000	1.3
--- RF230PacketC.nc	8 Mar 2009 22:02:38 -0000	1.4
***************
*** 22,27 ****
   */

- #include <HplRF230.h>
- 
  configuration RF230PacketC
  {
--- 22,25 ----
***************
*** 54,61 ****

  	PacketAcknowledgements	= RF230PacketP;
! 	PacketLinkQuality		= RF230PacketP.PacketLinkQuality;
! 	PacketTransmitPower		= RF230PacketP.PacketTransmitPower;
! 	PacketRSSI				= RF230PacketP.PacketRSSI;
! 	PacketSleepInterval		= RF230PacketP.PacketSleepInterval;
  	PacketTimeSyncOffset	= RF230PacketP.PacketTimeSyncOffset;

--- 52,59 ----

  	PacketAcknowledgements	= RF230PacketP;
! 	PacketLinkQuality	= RF230PacketP.PacketLinkQuality;
! 	PacketTransmitPower	= RF230PacketP.PacketTransmitPower;
! 	PacketRSSI		= RF230PacketP.PacketRSSI;
! 	PacketSleepInterval	= RF230PacketP.PacketSleepInterval;
  	PacketTimeSyncOffset	= RF230PacketP.PacketTimeSyncOffset;

Index: RF230TimeSyncMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230TimeSyncMessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230TimeSyncMessageC.nc	22 Jan 2009 20:04:37 -0000	1.2
--- RF230TimeSyncMessageC.nc	8 Mar 2009 22:02:38 -0000	1.3
***************
*** 24,28 ****
  #include <Timer.h>
  #include <AM.h>
! #include <HplRF230.h>

  configuration RF230TimeSyncMessageC
--- 24,28 ----
  #include <Timer.h>
  #include <AM.h>
! #include <RadioAlarm.h>

  configuration RF230TimeSyncMessageC

Index: RF230TimeSyncMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230TimeSyncMessageP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230TimeSyncMessageP.nc	22 Jan 2009 20:04:37 -0000	1.2
--- RF230TimeSyncMessageP.nc	8 Mar 2009 22:02:38 -0000	1.3
***************
*** 23,27 ****

  #include <TimeSyncMessage.h>
! #include <HplRF230.h>

  module RF230TimeSyncMessageP
--- 23,27 ----

  #include <TimeSyncMessage.h>
! #include <RadioAlarm.h>

  module RF230TimeSyncMessageP

--- HplRF230.nc DELETED ---