[Tinyos-commits] CVS: tinyos-1.x/tos/platform/msp430 msp430hardware.h, 1.29, 1.30

[Joe Polastre]

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

Modified Files:
	msp430hardware.h 
Log Message:
bug in __nesc_atomic_sleep() for timer a check
if timera is used by a module, such as the adc, for triggering
samples, the DCO must stay on.  but, if the samples are recovered by the
dma, then the timer a interrupt enable bit is not set (since the dma handles
the ifg flag being set).  in this case, you want to check if timer a is
NOT stopped (ie, not in "stop_mode") and if it is using a clock source
that relies on the DCO.


Index: msp430hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430/msp430hardware.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** msp430hardware.h	20 Jun 2005 22:07:45 -0000	1.29
--- msp430hardware.h	18 Aug 2005 02:54:39 -0000	1.30
***************
*** 260,265 ****
      LPMode_bits = LPM3_bits;
      // TimerA, USART0, USART1 check
!     if ( (((TACCTL0 & CCIE) || (TACCTL1 & CCIE) || (TACCTL2 & CCIE))
!          && ((TACTL & TASSEL_3) == TASSEL_2))
        || ((ME1 & (UTXE0 | URXE0)) && (U0TCTL & SSEL1))
        || ((ME2 & (UTXE1 | URXE1)) && (U1TCTL & SSEL1)) 
--- 260,264 ----
      LPMode_bits = LPM3_bits;
      // TimerA, USART0, USART1 check
!     if ( ((((TACTL & MC_3) != MC_0) && (TACTL & TASSEL_3) == TASSEL_2))
        || ((ME1 & (UTXE0 | URXE0)) && (U0TCTL & SSEL1))
        || ((ME2 & (UTXE1 | URXE1)) && (U1TCTL & SSEL1))