[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio XE1205RadioM.nc, 1.38, 1.39

[Henri DF]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22728

Modified Files:
	XE1205RadioM.nc 
Log Message:
fix two LPL bugs:

- in TIMER_POST_TX_RSSI handler, call sleepOrStartReceive() so that wakup
  timer is properly set.

- re-enable RSSI when necessary in order to get valid readings

Both bugs found by Maxime Muller (Shockfish)


Index: XE1205RadioM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio/XE1205RadioM.nc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** XE1205RadioM.nc	26 Jan 2006 10:12:10 -0000	1.38
--- XE1205RadioM.nc	12 Apr 2006 20:40:44 -0000	1.39
***************
*** 483,487 ****
  	if (rssiPostTx.rssiStatus == flagHaveRssiBoth) post postTxRssiDone();
        }
!       if (lplRXState) radioSleep();
        break;
  
--- 483,487 ----
  	if (rssiPostTx.rssiStatus == flagHaveRssiBoth) post postTxRssiDone();
        }
!       if (lplRXState) sleepOrStartReceive();
        break;
  
***************
*** 532,540 ****
  
        startReceive();
!       if (lplRXState) {
! 
  	timerState = TIMER_LPL_AWAKE;
!       } else
! 	  timerState = TIMER_IDLE;
        break;
        
--- 532,539 ----
  
        startReceive();
!       if (lplRXState) 
  	timerState = TIMER_LPL_AWAKE;
!       else
! 	timerState = TIMER_IDLE;
        break;
        
***************
*** 839,842 ****
--- 838,842 ----
  	call XE1205Control.AntennaRx();
  	call XE1205Control.RxMode();
+ 	call XE1205Control.SetRssiMode(TRUE);
  
  	if (!call TimerJiffy.setOneShot(usecs_to_jiffies(Xe1205_Sleep_to_RX_Time))) 
***************
*** 1130,1134 ****
        mState = RADIO_LISTEN;
        call XE1205Control.loadDataPattern();
!       call XE1205Control.SetRssiMode(FALSE);
        startReceivePkt();
        return;
--- 1130,1134 ----
        mState = RADIO_LISTEN;
        call XE1205Control.loadDataPattern();
!       call XE1205Control.SetRssiMode(TRUE);
        startReceivePkt();
        return;