/*#*
*#* $Log$
+ *#* 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.
+ *#*
*#* Revision 1.18 2004/09/20 03:31:03 bernie
*#* Fix racy racy code.
*#*
#include <arch_config.h> // ARCH_BOARD_KC
#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>
#define TIMER_ON_OUTPUT_COMPARE2 3
-/*!
- * \def CONFIG_TIMER_STROBE
- *
- * This is a debug facility that can be used to
- * monitor timer interrupt activity on an external pin.
- *
- * To use strobes, redefine the macros TIMER_STROBE_ON,
- * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set
- * CONFIG_TIMER_STROBE to 1.
- */
-#if !defined(CONFIG_TIMER_STROBE) || !CONFIG_TIMER_STROBE
- #define TIMER_STROBE_ON do {/*nop*/} while(0)
- #define TIMER_STROBE_OFF do {/*nop*/} while(0)
- #define TIMER_STROBE_INIT do {/*nop*/} while(0)
-#endif
-
-
/* Not needed, IRQ timer flag cleared automatically */
#define timer_hw_irq() do {} while (0)
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