Reorder include files.

[bertos.git] / bertos / cpu / avr / drv / adc_avr.c

diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c
index bf5a5600d7e41fb303d4b35aee64b0392e87565a..33beeca39acad872e9c60739af403f8f3a968472 100644 (file)
--- a/bertos/cpu/avr/drv/adc_avr.c
+++ b/bertos/cpu/avr/drv/adc_avr.c
@@ -34,19 +34,20 @@
  * \version $Id$
  * \author Francesco Sacchi <batt@develer.com>
  *
- * This module is automatically included so no need to include 
+ * This module is automatically included so no need to include
  * in test list.
  * notest: avr
  */
 
 #include "adc_avr.h"
 
-#include <cpu/irq.h> // IRQ_ASSERT_ENABLED()
 #include "cfg/cfg_adc.h"
 #include "cfg/cfg_kern.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
+#include <cpu/irq.h> // IRQ_ASSERT_ENABLED()
+
 #include <drv/adc.h>
 
 #include <avr/io.h>
@@ -89,7 +90,7 @@
 INLINE void adc_hw_select_ch(uint8_t ch)
 {
        /* Set to 0 all mux registers */
-       ADMUX &= ~(BV(MUX3) | BV(MUX3) | BV(MUX2) | BV(MUX1) | BV(MUX0));
+       ADMUX &= ~(BV(MUX4) | BV(MUX3) | BV(MUX2) | BV(MUX1) | BV(MUX0));
 
        /* Select channel, only first 8 channel modes are supported for now */
        ADMUX |= (ch & 0x07);
@@ -146,8 +147,10 @@ INLINE void adc_hw_init(void)
                #error Unsupported ADC ref value.
        #endif
 
+       #if defined(ADCSRB)
        /* Disable Auto trigger source: ADC in Free running mode. */
        ADCSRB = 0;
+       #endif
 
        /* Enable ADC, disable autotrigger mode. */
        ADCSRA = BV(ADEN);