[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430 McuSleepC.nc, 1.1.2.4, 1.1.2.5

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24025/tos/chips/msp430

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	McuSleepC.nc 
Log Message:
Removed an atmega128 comment (copied by accidence).
Added guards around ADC check.

Index: McuSleepC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/McuSleepC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** McuSleepC.nc	20 Nov 2006 14:50:18 -0000	1.1.2.4
--- McuSleepC.nc	29 Nov 2006 11:35:18 -0000	1.1.2.5
***************
*** 53,59 ****
  
    /* Note that the power values are maintained in an order
!    * based on their active components, NOT on their values.
!    * Look at atm128hardware.h and page 42 of the ATmeg128
!    * manual (figure 17).*/
    // NOTE: This table should be in progmem.
    const uint16_t msp430PowerBits[MSP430_POWER_LPM4 + 1] = {
--- 53,57 ----
  
    /* Note that the power values are maintained in an order
!    * based on their active components, NOT on their values.*/
    // NOTE: This table should be in progmem.
    const uint16_t msp430PowerBits[MSP430_POWER_LPM4 + 1] = {
***************
*** 83,87 ****
        pState = MSP430_POWER_LPM1;
      
!     // ADC12 check: 
      if (ADC12CTL0 & ADC12ON){
        if (ADC12CTL1 & ADC12SSEL_2){
--- 81,86 ----
        pState = MSP430_POWER_LPM1;
      
! #ifdef __msp430_have_adc12
!     // ADC12 check, pre-condition: pState != MSP430_POWER_ACTIVE
      if (ADC12CTL0 & ADC12ON){
        if (ADC12CTL1 & ADC12SSEL_2){
***************
*** 98,101 ****
--- 97,101 ----
        }
      }
+ #endif
      
      return pState;