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

[Miklos Maroti]

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

Modified Files:
	IEEE154MessageLayerP.nc 
Log Message:
Fix ACK request bit overwrite in Send.send

Index: IEEE154MessageLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/IEEE154MessageLayerP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IEEE154MessageLayerP.nc	8 May 2009 14:42:21 -0000	1.5
--- IEEE154MessageLayerP.nc	17 Jun 2009 18:19:00 -0000	1.6
***************
*** 287,290 ****
--- 287,291 ----
  	async command void RadioPacket.clear(message_t* msg)
  	{
+ 		call IEEE154MessageLayer.createDataFrame(msg);
  		call SubPacket.clear(msg);
  	}
***************
*** 342,346 ****
  			return EINVAL;
  
! 		call IEEE154MessageLayer.createDataFrame(msg);
  		call Packet.setPayloadLength(msg, len);
  	    	call Ieee154Packet.setSource(msg, call Ieee154Packet.address());
--- 343,350 ----
  			return EINVAL;
  
! 		// user forgot to call Packet.clear(), maybe we should return EFAIL
! 		if( ! call IEEE154MessageLayer.isDataFrame(msg) )
! 			call IEEE154MessageLayer.createDataFrame(msg);
! 
  		call Packet.setPayloadLength(msg, len);
  	    	call Ieee154Packet.setSource(msg, call Ieee154Packet.address());
***************
*** 365,370 ****
  	command error_t Send.send(message_t* msg)
  	{
! 		// lower leveles can send other frames
! 		call IEEE154MessageLayer.createDataFrame(msg);
  
  		return call SubSend.send(msg);
--- 369,375 ----
  	command error_t Send.send(message_t* msg)
  	{
! 		// user forgot to call Packet.clear(), lower levels can send other types
! 		if( ! call IEEE154MessageLayer.isDataFrame(msg) )
! 			call IEEE154MessageLayer.createDataFrame(msg);
  
  		return call SubSend.send(msg);