[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica MicaTimer.h, 1.1.2.3, 1.1.2.4

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21974

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	MicaTimer.h 
Log Message:
head merge


Index: MicaTimer.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/MicaTimer.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MicaTimer.h	1 May 2006 17:19:08 -0000	1.1.2.3
--- MicaTimer.h	22 Sep 2006 19:34:14 -0000	1.1.2.4
***************
*** 30,37 ****
  
     Note that the timers thus obtained will not be exactly at 32768Hz or
!    1MHz, because the clock doesn't divide by a power of two to those frequencies,
!    and/or the clock frequency is not accurate. If you need more accurate timing,
!    you should use the calibration functions offered by the Atm128Calibrate interface
!    provided by PlatformC.
  */
  
--- 30,44 ----
  
     Note that the timers thus obtained will not be exactly at 32768Hz or
!    1MHz, because the clock doesn't divide by a power of two to those
!    frequencies, and/or the clock frequency is not accurate. If you need
!    more accurate timing, you should use the calibration functions
!    offered by the Atm128Calibrate interface provided by PlatformC.
! 
!    This file also defines EXT_STANDBY_T0_THRESHOLD, a threshold on
!    remaining time till the next timer 0 interrupt under which the mote
!    should sleep in ext standby rather than power save. This is only
!    important when not using the internal oscillator.  Wake up from power
!    save takes 65536 cycles (6 cycles for ext standby), which is, e.g.,
!    ~9.4ms at 7Mhz.
  */
  
***************
*** 65,69 ****
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 2,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 0
  };
  
--- 72,77 ----
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 2,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 0,
!   EXT_STANDBY_T0_THRESHOLD = 80,
  };
  
***************
*** 78,82 ****
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 0,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 1
  };
  
--- 86,91 ----
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 0,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 1,
!   EXT_STANDBY_T0_THRESHOLD = 40
  };
  
***************
*** 91,95 ****
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 1,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 2
  };
  
--- 100,105 ----
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 1,
    MICA_PRESCALER_THREE = ATM128_CLK16_NORMAL,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 2,
!   EXT_STANDBY_T0_THRESHOLD = 24
  };
  
***************
*** 104,108 ****
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 0,
    MICA_PRESCALER_THREE = ATM128_CLK16_DIVIDE_8,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 0
  };
  
--- 114,119 ----
    MICA_DIVIDE_ONE_FOR_32KHZ_LOG2 = 0,
    MICA_PRESCALER_THREE = ATM128_CLK16_DIVIDE_8,
!   MICA_DIVIDE_THREE_FOR_MICRO_LOG2 = 0,
!   EXT_STANDBY_T0_THRESHOLD = 12
  };