[Tinyos-commits] CVS: tinyos-1.x/tos/platform/msp430 MSP430ClockC.nc, 1.11, 1.12 MSP430ClockM.nc, 1.14, 1.15

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9884

Modified Files:
	MSP430ClockC.nc MSP430ClockM.nc 
Log Message:
temporary bug fix for msp430 not going to sleep appropriately.

problem is that MSP430ClockM starts TimerA for use with the continual
recalibration routine for the DCO.  Instead, the continual calibration
should be updated to the new ADC/DAC TimerA Exclusive model, and try to
start and stop TimerA when doing the recalibration.  Temporary fix is
to remove start and stop of timer A from MSP430ClockM and disable
continual recalibration.  Cory will fix recalibration this week.


Index: MSP430ClockC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430/MSP430ClockC.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MSP430ClockC.nc	27 Mar 2005 03:47:25 -0000	1.11
--- MSP430ClockC.nc	10 Oct 2005 17:04:54 -0000	1.12
***************
*** 31,35 ****
  {
    components MSP430ClockM
-            , MSP430DCOCalibC  //perpetual recalibration with each ACLK overflow
  	   ;
  
--- 31,34 ----

Index: MSP430ClockM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430/MSP430ClockM.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MSP430ClockM.nc	27 Mar 2005 03:47:25 -0000	1.14
--- MSP430ClockM.nc	10 Oct 2005 17:04:54 -0000	1.15
***************
*** 222,226 ****
      atomic
      {
-       startTimerA();
        startTimerB();
      }
--- 222,225 ----
***************
*** 233,237 ****
      {
        stopTimerB();
-       stopTimerA();
      }
      return SUCCESS;
--- 232,235 ----