[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf212 RF212DriverLayerP.nc, 1.6, 1.7 RF212Ieee154MessageC.nc, 1.4, 1.5

[Miklos Maroti]

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

Modified Files:
	RF212DriverLayerP.nc RF212Ieee154MessageC.nc 
Log Message:
Apply bug fixes related to BLIP submitted by Lars Schor

Index: RF212DriverLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf212/RF212DriverLayerP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RF212DriverLayerP.nc	9 Apr 2009 21:26:40 -0000	1.6
--- RF212DriverLayerP.nc	8 May 2009 14:42:21 -0000	1.7
***************
*** 493,500 ****
  			*(timesync_relative_t*)timesync = (*(timesync_absolute_t*)timesync) - time32;
  
! 		do {
  			call FastSpiByte.splitReadWrite(*(data++));
- 		}
- 		while( --length != 0 );
  
  		// wait for the SPI transfer to finish
--- 493,498 ----
  			*(timesync_relative_t*)timesync = (*(timesync_absolute_t*)timesync) - time32;
  
! 		while( length-- != 0 )
  			call FastSpiByte.splitReadWrite(*(data++));
  
  		// wait for the SPI transfer to finish
***************
*** 960,967 ****
  	async command uint8_t PacketLinkQuality.get(message_t* msg)
  	{
- 		// we have some bug in BLIP, so fix it here
- 		if( getMeta(msg)->lqi > 120 )
- 			return 120;
- 
  		return getMeta(msg)->lqi;
  	}
--- 958,961 ----

Index: RF212Ieee154MessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RF212Ieee154MessageC.nc	10 Apr 2009 08:33:20 -0000	1.4
--- RF212Ieee154MessageC.nc	8 May 2009 14:42:21 -0000	1.5
***************
*** 111,115 ****
  	MessageBufferLayerC.RadioSend -> CollisionAvoidanceLayerC;
  	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
! 	MessageBufferLayerC.RadioState -> CollisionAvoidanceLayerC;
  	RadioChannel = MessageBufferLayerC;
  
--- 111,115 ----
  	MessageBufferLayerC.RadioSend -> CollisionAvoidanceLayerC;
  	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
! 	MessageBufferLayerC.RadioState -> RF212DriverLayerC;
  	RadioChannel = MessageBufferLayerC;