/*!
* \file
* <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
* -->
*
* \version $Id$
/*#*
*#* $Log$
+ *#* Revision 1.24 2005/04/11 19:10:28 bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.23 2005/03/01 23:24:51 bernie
+ *#* Tweaks for avr-libc 1.2.x.
+ *#*
+ *#* Revision 1.21 2004/12/13 12:07:06 bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.20 2004/11/16 20:59:46 bernie
+ *#* Include <avr/io.h> explicitly.
+ *#*
*#* Revision 1.19 2004/10/19 08:56:41 bernie
*#* TIMER_STROBE_ON, TIMER_STROBE_OFF, TIMER_STROBE_INIT: Move from timer_avr.h to timer.h, where they really belong.
*#*
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
-#include <arch_config.h> // ARCH_BOARD_KC
-#include "hw.h"
+#include <cfg/arch_config.h> // ARCH_BOARD_KC
+#include <cfg/macros.h> // BV()
+#include <hw.h>
-#include <avr/wdt.h>
#include <avr/signal.h>
+#include <avr/io.h>
#if defined(ARCH_BOARD_KC) && (ARCH & ARCH_BOARD_KC)
#include <drv/adc.h>
static void timer_hw_init(void)
{
cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
+ IRQ_SAVE_DISABLE(flags);
/* Reset Timer flags */
TIFR = BV(OCF0) | BV(TOV0);
TIMSK &= ~BV(TOIE0);
TIMSK |= BV(OCIE0);
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
}
//! Frequency of the hardware high precision timer
static void timer_hw_init(void)
{
cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
+ IRQ_SAVE_DISABLE(flags);
/* Reset Timer overflow flag */
TIFR |= BV(TOV1);
/* Enable timer interrupt: Timer/Counter1 Overflow */
TIMSK |= BV(TOIE1);
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
}
//! Frequency of the hardware high precision timer
static void timer_hw_init(void)
{
cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
+ IRQ_SAVE_DISABLE(flags);
/* Reset Timer flags */
TIFR = BV(OCF2) | BV(TOV2);
TIMSK &= ~BV(TOIE2);
TIMSK |= BV(OCIE2);
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
}
//! Frequency of the hardware high precision timer
if (!_adc_trigger_lock)
{
+ // Backwards compatibility fix for avr-libc 1.0.4
+ #ifndef ADATE
+ #define ADATE ADFR
+ #endif
+
/*
* Disable free-running mode to avoid starting a
* new conversion before the ADC handler has read
*
* NOTE: writing 0 to ADSC and ADIF has no effect.
*/
- ADCSRA = ADCSRA & ~(BV(ADFR) | BV(ADIF) | BV(ADSC));
+ ADCSRA = ADCSRA & ~(BV(ADATE) | BV(ADIF) | BV(ADSC));
ADC_SETCHN(_adc_idx_next);
_adc_trigger_lock = true;