X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fadc_avr.c;h=8c3217e73c5551fed554d6bf71ae735335eb9852;hb=d273eeaf8213a957c6ae0889d6d2f9279a7e17a5;hp=942345a7466538e03a7c13a7a4b57896828afb8d;hpb=92d5e5f668bb596036e7c4fe674b29448f7ac65d;p=bertos.git

diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c
index 942345a7..8c3217e7 100644
--- a/bertos/cpu/avr/drv/adc_avr.c
+++ b/bertos/cpu/avr/drv/adc_avr.c
@@ -33,15 +33,22 @@
  *
  * \version $Id$
  * \author Francesco Sacchi <batt@develer.com>
+ *
+ * This module is automatically included so no need to include
+ * in test list.
+ * notest: avr
  */
 
 #include "adc_avr.h"
 
 #include "cfg/cfg_adc.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
+#include <cpu/irq.h> // IRQ_ASSERT_ENABLED()
+
 #include <drv/adc.h>
 
 #include <avr/io.h>
@@ -84,7 +91,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);
@@ -106,7 +113,7 @@ INLINE uint16_t adc_hw_read(void)
 
 	#if CONFIG_KERN
 		// Ensure IRQs enabled.
-		ASSERT(IRQ_ENABLED());
+		IRQ_ASSERT_ENABLED();
 		adc_process = proc_current();
 		sig_wait(SIG_ADC_COMPLETE);
 	#else
@@ -141,8 +148,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);