[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf230 RF230ActiveMessageC.nc, 1.1, 1.2 RF230ActiveMessageP.nc, 1.3, 1.4 RF230Packet.h, 1.1, 1.2 RF230PacketC.nc, 1.1, 1.2 RF230PacketP.nc, 1.1, 1.2

Sun Mar 29 14:12:08 PDT 2009

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

Modified Files:
	RF230ActiveMessageC.nc RF230ActiveMessageP.nc RF230Packet.h 
	RF230PacketC.nc RF230PacketP.nc 
Log Message:
rename IEEE154Packet components to avoid a clash with blip

Index: RF230ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230ActiveMessageC.nc	10 Mar 2009 20:37:58 -0000	1.1
--- RF230ActiveMessageC.nc	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 51,55 ****
  implementation
  {
! 	components RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, RadioAlarmC;

  #ifdef RADIO_DEBUG
--- 51,55 ----
  implementation
  {
! 	components RF230ActiveMessageP, RF230PacketC, IEEE154Packet2C, RadioAlarmC;

  #ifdef RADIO_DEBUG
***************
*** 57,61 ****
  #endif

! 	RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC;
  	RF230ActiveMessageP.Packet -> RF230PacketC;
  	RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
--- 57,61 ----
  #endif

! 	RF230ActiveMessageP.IEEE154Packet2 -> IEEE154Packet2C;
  	RF230ActiveMessageP.Packet -> RF230PacketC;
  	RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
***************
*** 101,105 ****

  	ActiveMessageLayerC.Config -> RF230ActiveMessageP;
! 	ActiveMessageLayerC.AMPacket -> IEEE154PacketC;
  	ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
  	ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
--- 101,105 ----

  	ActiveMessageLayerC.Config -> RF230ActiveMessageP;
! 	ActiveMessageLayerC.AMPacket -> IEEE154Packet2C;
  	ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
  	ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
***************
*** 117,121 ****
  #ifdef LOW_POWER_LISTENING
  	LowPowerListeningLayerC.PacketSleepInterval -> RF230PacketC;
! 	LowPowerListeningLayerC.IEEE154Packet -> IEEE154PacketC;
  	LowPowerListeningLayerC.PacketAcknowledgements -> RF230PacketC;
  #endif
--- 117,121 ----
  #ifdef LOW_POWER_LISTENING
  	LowPowerListeningLayerC.PacketSleepInterval -> RF230PacketC;
! 	LowPowerListeningLayerC.IEEE154Packet2 -> IEEE154Packet2C;
  	LowPowerListeningLayerC.PacketAcknowledgements -> RF230PacketC;
  #endif

Index: RF230ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RF230ActiveMessageP.nc	27 Mar 2009 21:55:10 -0000	1.3
--- RF230ActiveMessageP.nc	29 Mar 2009 21:12:06 -0000	1.4
***************
*** 43,47 ****
  	uses
  	{
! 		interface IEEE154Packet;
  		interface Packet;
  		interface RadioAlarm;
--- 43,47 ----
  	uses
  	{
! 		interface IEEE154Packet2;
  		interface Packet;
  		interface RadioAlarm;
***************
*** 55,69 ****
  	async command uint8_t RF230DriverConfig.getLength(message_t* msg)
  	{
! 		return call IEEE154Packet.getLength(msg);
  	}

  	async command void RF230DriverConfig.setLength(message_t* msg, uint8_t len)
  	{
! 		call IEEE154Packet.setLength(msg, len);
  	}

  	async command uint8_t* RF230DriverConfig.getPayload(message_t* msg)
  	{
! 		return ((uint8_t*)(call IEEE154Packet.getHeader(msg))) + 1;
  	}

--- 55,69 ----
  	async command uint8_t RF230DriverConfig.getLength(message_t* msg)
  	{
! 		return call IEEE154Packet2.getLength(msg);
  	}

  	async command void RF230DriverConfig.setLength(message_t* msg, uint8_t len)
  	{
! 		call IEEE154Packet2.setLength(msg, len);
  	}

  	async command uint8_t* RF230DriverConfig.getPayload(message_t* msg)
  	{
! 		return ((uint8_t*)(call IEEE154Packet2.getHeader(msg))) + 1;
  	}

***************
*** 87,91 ****
  	async command bool RF230DriverConfig.requiresRssiCca(message_t* msg)
  	{
! 		return call IEEE154Packet.isDataFrame(msg);
  	}

--- 87,91 ----
  	async command bool RF230DriverConfig.requiresRssiCca(message_t* msg)
  	{
! 		return call IEEE154Packet2.isDataFrame(msg);
  	}

***************
*** 94,118 ****
  	async command bool SoftwareAckConfig.requiresAckWait(message_t* msg)
  	{
! 		return call IEEE154Packet.requiresAckWait(msg);
  	}

  	async command bool SoftwareAckConfig.isAckPacket(message_t* msg)
  	{
! 		return call IEEE154Packet.isAckFrame(msg);
  	}

  	async command bool SoftwareAckConfig.verifyAckPacket(message_t* data, message_t* ack)
  	{
! 		return call IEEE154Packet.verifyAckReply(data, ack);
  	}

  	async command bool SoftwareAckConfig.requiresAckReply(message_t* msg)
  	{
! 		return call IEEE154Packet.requiresAckReply(msg);
  	}

  	async command void SoftwareAckConfig.createAckPacket(message_t* data, message_t* ack)
  	{
! 		call IEEE154Packet.createAckReply(data, ack);
  	}

--- 94,118 ----
  	async command bool SoftwareAckConfig.requiresAckWait(message_t* msg)
  	{
! 		return call IEEE154Packet2.requiresAckWait(msg);
  	}

  	async command bool SoftwareAckConfig.isAckPacket(message_t* msg)
  	{
! 		return call IEEE154Packet2.isAckFrame(msg);
  	}

  	async command bool SoftwareAckConfig.verifyAckPacket(message_t* data, message_t* ack)
  	{
! 		return call IEEE154Packet2.verifyAckReply(data, ack);
  	}

  	async command bool SoftwareAckConfig.requiresAckReply(message_t* msg)
  	{
! 		return call IEEE154Packet2.requiresAckReply(msg);
  	}

  	async command void SoftwareAckConfig.createAckPacket(message_t* data, message_t* ack)
  	{
! 		call IEEE154Packet2.createAckReply(data, ack);
  	}

***************
*** 139,153 ****
  	async command uint8_t UniqueConfig.getSequenceNumber(message_t* msg)
  	{
! 		return call IEEE154Packet.getDSN(msg);
  	}

  	async command void UniqueConfig.setSequenceNumber(message_t* msg, uint8_t dsn)
  	{
! 		call IEEE154Packet.setDSN(msg, dsn);
  	}

  	async command am_addr_t UniqueConfig.getSender(message_t* msg)
  	{
! 		return call IEEE154Packet.getSrcAddr(msg);
  	}

--- 139,153 ----
  	async command uint8_t UniqueConfig.getSequenceNumber(message_t* msg)
  	{
! 		return call IEEE154Packet2.getDSN(msg);
  	}

  	async command void UniqueConfig.setSequenceNumber(message_t* msg, uint8_t dsn)
  	{
! 		call IEEE154Packet2.setDSN(msg, dsn);
  	}

  	async command am_addr_t UniqueConfig.getSender(message_t* msg)
  	{
! 		return call IEEE154Packet2.getSrcAddr(msg);
  	}

***************
*** 162,166 ****
  	{
  		// the user forgot to call clear, we should return EINVAL
! 		if( ! call IEEE154Packet.isDataFrame(msg) )
  			call Packet.clear(msg);

--- 162,166 ----
  	{
  		// the user forgot to call clear, we should return EINVAL
! 		if( ! call IEEE154Packet2.isDataFrame(msg) )
  			call Packet.clear(msg);

***************
*** 172,176 ****
  	async command bool CsmaConfig.requiresSoftwareCCA(message_t* msg)
  	{
! 		return call IEEE154Packet.isDataFrame(msg);
  	}

--- 172,176 ----
  	async command bool CsmaConfig.requiresSoftwareCCA(message_t* msg)
  	{
! 		return call IEEE154Packet2.isDataFrame(msg);
  	}

***************
*** 197,207 ****
  		 */

! 		uint8_t len = call IEEE154Packet.getLength(msg);
! 		return call IEEE154Packet.getAckRequired(msg) ? len + 6 + 16 + 11 + 10 : len + 6 + 10;
  	}

  	async command am_addr_t TrafficMonitorConfig.getSender(message_t* msg)
  	{
! 		return call IEEE154Packet.getSrcAddr(msg);
  	}

--- 197,207 ----
  		 */

! 		uint8_t len = call IEEE154Packet2.getLength(msg);
! 		return call IEEE154Packet2.getAckRequired(msg) ? len + 6 + 16 + 11 + 10 : len + 6 + 10;
  	}

  	async command am_addr_t TrafficMonitorConfig.getSender(message_t* msg)
  	{
! 		return call IEEE154Packet2.getSrcAddr(msg);
  	}

***************
*** 245,249 ****

  		// 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
--- 245,249 ----

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

Index: RF230Packet.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230Packet.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230Packet.h	10 Mar 2009 20:37:58 -0000	1.1
--- RF230Packet.h	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 25,29 ****
  #define __RF230PACKET_H__

! #include <IEEE154Packet.h>

  typedef ieee154_header_t rf230packet_header_t;
--- 25,29 ----
  #define __RF230PACKET_H__

! #include <IEEE154Packet2.h>

  typedef ieee154_header_t rf230packet_header_t;

Index: RF230PacketC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230PacketC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230PacketC.nc	10 Mar 2009 20:37:58 -0000	1.1
--- RF230PacketC.nc	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 42,53 ****
  implementation
  {
! 	components RF230PacketP, IEEE154PacketC, LocalTimeMicroC, LocalTimeMilliC;

! 	RF230PacketP.IEEE154Packet -> IEEE154PacketC;
  	RF230PacketP.LocalTimeRadio -> LocalTimeMicroC;
  	RF230PacketP.LocalTimeMilli -> LocalTimeMilliC;

  	Packet = RF230PacketP;
! 	AMPacket = IEEE154PacketC;

  	PacketAcknowledgements	= RF230PacketP;
--- 42,53 ----
  implementation
  {
! 	components RF230PacketP, IEEE154Packet2C, LocalTimeMicroC, LocalTimeMilliC;

! 	RF230PacketP.IEEE154Packet2 -> IEEE154Packet2C;
  	RF230PacketP.LocalTimeRadio -> LocalTimeMicroC;
  	RF230PacketP.LocalTimeMilli -> LocalTimeMilliC;

  	Packet = RF230PacketP;
! 	AMPacket = IEEE154Packet2C;

  	PacketAcknowledgements	= RF230PacketP;

Index: RF230PacketP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230PacketP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RF230PacketP.nc	10 Mar 2009 20:37:58 -0000	1.1
--- RF230PacketP.nc	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 44,48 ****
  	uses
  	{
! 		interface IEEE154Packet;

  		interface LocalTime<TRadio> as LocalTimeRadio;
--- 44,48 ----
  	uses
  	{
! 		interface IEEE154Packet2;

  		interface LocalTime<TRadio> as LocalTimeRadio;
***************
*** 69,73 ****
  	command void Packet.clear(message_t* msg) 
  	{
! 		call IEEE154Packet.createDataFrame(msg);

  		getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA;
--- 69,73 ----
  	command void Packet.clear(message_t* msg) 
  	{
! 		call IEEE154Packet2.createDataFrame(msg);

  		getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA;
***************
*** 76,85 ****
  	inline command void Packet.setPayloadLength(message_t* msg, uint8_t len) 
  	{
! 		call IEEE154Packet.setLength(msg, len + PACKET_LENGTH_INCREASE);
  	}

  	inline command uint8_t Packet.payloadLength(message_t* msg) 
  	{
! 		return call IEEE154Packet.getLength(msg) - PACKET_LENGTH_INCREASE;
  	}

--- 76,85 ----
  	inline command void Packet.setPayloadLength(message_t* msg, uint8_t len) 
  	{
! 		call IEEE154Packet2.setLength(msg, len + PACKET_LENGTH_INCREASE);
  	}

  	inline command uint8_t Packet.payloadLength(message_t* msg) 
  	{
! 		return call IEEE154Packet2.getLength(msg) - PACKET_LENGTH_INCREASE;
  	}

***************
*** 101,105 ****
  	async command error_t PacketAcknowledgements.requestAck(message_t* msg)
  	{
! 		call IEEE154Packet.setAckRequired(msg, TRUE);

  		return SUCCESS;
--- 101,105 ----
  	async command error_t PacketAcknowledgements.requestAck(message_t* msg)
  	{
! 		call IEEE154Packet2.setAckRequired(msg, TRUE);

  		return SUCCESS;
***************
*** 108,112 ****
  	async command error_t PacketAcknowledgements.noAck(message_t* msg)
  	{
! 		call IEEE154Packet.setAckRequired(msg, FALSE);

  		return SUCCESS;
--- 108,112 ----
  	async command error_t PacketAcknowledgements.noAck(message_t* msg)
  	{
! 		call IEEE154Packet2.setAckRequired(msg, FALSE);

  		return SUCCESS;
***************
*** 245,249 ****
  	async command uint8_t PacketTimeSyncOffset.get(message_t* msg)
  	{
! 		return call IEEE154Packet.getLength(msg) - PACKET_LENGTH_INCREASE - sizeof(timesync_absolute_t);
  	}

--- 245,249 ----
  	async command uint8_t PacketTimeSyncOffset.get(message_t* msg)
  	{
! 		return call IEEE154Packet2.getLength(msg) - PACKET_LENGTH_INCREASE - sizeof(timesync_absolute_t);
  	}