*
* \version $Id$
* \author Francesco Sacchi <batt@develer.com>
+ *
+ * This module is automatically included so no need to include
+ * in test list.
+ * notest: avr
+ *
+ * $WIZ$
*/
#include "adc_avr.h"
-#include <cfg/cfg_adc.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_adc.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>
#include <avr/interrupt.h>
+/**
+ * ADC voltage referencese.
+ *
+ * $WIZ$ avr_adc_refs = "ADC_AVR_AREF", "ADC_AVR_AVCC", "ADC_AVR_INT256"
+ * \{
+ */
#define ADC_AVR_AREF 0
#define ADC_AVR_AVCC 1
#define ADC_AVR_INT256 2
+/* \} */
-#if CONFIG_KERNEL
+#if CONFIG_KERN
#include <cfg/module.h>
#include <kern/proc.h>
#include <kern/signal.h>
#if !CONFIG_KERN_SIGNALS
- #error Signals must be active to use ADC with kernel
+ #error Signals must be active to use the ADC with kernel
#endif
/* Signal adc convertion end */
{
sig_signal(adc_process, SIG_ADC_COMPLETE);
}
-#endif /* CONFIG_KERNEL */
+#endif /* CONFIG_KERN */
/**
* Select mux channel \a ch.
* \todo only first 8 channels are selectable!
*/
-INLINE void adc_hw_select_ch(uint8_t ch)
+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);
* If a kernel is present, preempt until convertion is complete, otherwise
* a busy wait on ADCS bit is done.
*/
-INLINE uint16_t adc_hw_read(void)
+uint16_t adc_hw_read(void)
{
// Ensure another convertion is not running.
ASSERT(!(ADCSRA & BV(ADSC)));
// Start convertion
ADCSRA |= BV(ADSC);
- #if CONFIG_KERNEL
+ #if CONFIG_KERN
// Ensure IRQs enabled.
- ASSERT(IRQ_ENABLED());
+ IRQ_ASSERT_ENABLED();
adc_process = proc_current();
sig_wait(SIG_ADC_COMPLETE);
#else
/**
* Init ADC hardware.
*/
-INLINE void adc_hw_init(void)
+void adc_hw_init(void)
{
/*
* Select channel 0 as default,
#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);
- #if CONFIG_KERNEL
+ #if CONFIG_KERN
MOD_CHECK(proc);
ADCSRA |= BV(ADIE);
#endif