[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/layers ActiveMessageLayerP.nc, 1.4, 1.5

[Miklos Maroti]

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

Modified Files:
	ActiveMessageLayerP.nc 
Log Message:
fix packet length calculation

Index: ActiveMessageLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActiveMessageLayerP.nc	9 Apr 2009 20:48:02 -0000	1.4
--- ActiveMessageLayerP.nc	9 May 2009 18:07:07 -0000	1.5
***************
*** 228,255 ****
  	command void Packet.clear(message_t* msg)
  	{
! 		call SubPacket.clear(msg);
  	}
  
  	command uint8_t Packet.payloadLength(message_t* msg)
  	{
! 		return call SubPacket.payloadLength(msg);
  	}
  
  	command void Packet.setPayloadLength(message_t* msg, uint8_t len)
  	{
! 		call SubPacket.setPayloadLength(msg, len);
  	}
  
  	command uint8_t Packet.maxPayloadLength()
  	{
! 		return call SubPacket.maxPayloadLength();
  	}
  
  	command void* Packet.getPayload(message_t* msg, uint8_t len)
  	{
! 		if( len > call SubPacket.maxPayloadLength() )
  			return NULL;
  
! 		return ((void*)msg) + call SubPacket.headerLength(msg);
  	}
  }
--- 228,255 ----
  	command void Packet.clear(message_t* msg)
  	{
! 		call RadioPacket.clear(msg);
  	}
  
  	command uint8_t Packet.payloadLength(message_t* msg)
  	{
! 		return call RadioPacket.payloadLength(msg);
  	}
  
  	command void Packet.setPayloadLength(message_t* msg, uint8_t len)
  	{
! 		call RadioPacket.setPayloadLength(msg, len);
  	}
  
  	command uint8_t Packet.maxPayloadLength()
  	{
! 		return call RadioPacket.maxPayloadLength();
  	}
  
  	command void* Packet.getPayload(message_t* msg, uint8_t len)
  	{
! 		if( len > call RadioPacket.maxPayloadLength() )
  			return NULL;
  
! 		return ((void*)msg) + call RadioPacket.headerLength(msg);
  	}
  }