/*!
* \file
* <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004 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.
* -->
* \brief Low-level timer module for AVR
*/
-/*
- * $Log$
- * Revision 1.13 2004/08/24 14:30:11 bernie
- * Use new-style config macros for drv/timer.c
- *
- * Revision 1.12 2004/08/10 06:59:45 bernie
- * CONFIG_TIMER_STROBE: Define no-op default macros.
- *
- * Revision 1.11 2004/08/03 15:53:17 aleph
- * Fix spacing
- *
- * Revision 1.10 2004/08/02 20:20:29 aleph
- * Merge from project_ks
- *
- * Revision 1.9 2004/07/22 02:01:14 bernie
- * Use TIMER_PRESCALER consistently.
- *
- * Revision 1.8 2004/07/20 23:50:20 bernie
- * Also define TIMER_PRESCALER.
- *
- * Revision 1.7 2004/07/20 23:49:40 bernie
- * Compute value of OCR_DIVISOR from CLOCK_FREQ.
- *
- * Revision 1.6 2004/07/20 23:48:16 bernie
- * Finally remove redundant protos.
- *
- * Revision 1.5 2004/07/18 22:16:35 bernie
- * Add missing header; Prevent warning for project_ks-specific code.
- *
- * Revision 1.4 2004/06/27 15:22:15 aleph
- * Fix spacing
- *
- * Revision 1.3 2004/06/07 15:57:40 aleph
- * Update to latest AVR timer code
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/05/23 18:23:30 bernie
- * Import drv/timer module.
- *
- */
-
+/*#*
+ *#* $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.
+ *#*
+ *#* Revision 1.17 2004/09/14 21:07:09 bernie
+ *#* Include hw.h explicitly.
+ *#*
+ *#* Revision 1.16 2004/09/06 21:49:26 bernie
+ *#* CONFIG_TIMER_STROBE: be tolerant with missing optional macro.
+ *#*
+ *#* Revision 1.15 2004/08/25 14:12:08 rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.14 2004/08/24 16:27:01 bernie
+ *#* Add missing headers.
+ *#*
+ *#* Revision 1.13 2004/08/24 14:30:11 bernie
+ *#* Use new-style config macros for drv/timer.c
+ *#*
+ *#* Revision 1.12 2004/08/10 06:59:45 bernie
+ *#* CONFIG_TIMER_STROBE: Define no-op default macros.
+ *#*
+ *#* Revision 1.11 2004/08/03 15:53:17 aleph
+ *#* Fix spacing
+ *#*
+ *#* Revision 1.10 2004/08/02 20:20:29 aleph
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.9 2004/07/22 02:01:14 bernie
+ *#* Use TIMER_PRESCALER consistently.
+ *#*/
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
-#include <avr/wdt.h>
+#include <arch_config.h> // ARCH_BOARD_KC
+#include "hw.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.
- */
-#ifndef 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
*/
SIGNAL(SIG_OVERFLOW1)
{
- /*!
- * How many overflow we have to count before calling the true timer handler.
- * If timer overflow is at 24 kHz, with a value of 24 we have 1 ms between
- * each call.
- */
- #define TIMER1_OVF_COUNT 24
-
- static uint8_t count = TIMER1_OVF_COUNT;
-
- count--;
- if (!count)
- {
- timer_handler();
- count = TIMER1_OVF_COUNT;
- }
-
#if (ARCH & ARCH_BOARD_KC)
/*
* Super-optimization-hack: switch CPU ADC mux here, ASAP after the start
* of the handler.
*
* The switch is synchronized with the ADC handler using _adc_trigger_lock.
+ *
+ * Mel (A Real Programmer)
*/
extern uint8_t _adc_idx_next;
extern bool _adc_trigger_lock;
if (!_adc_trigger_lock)
{
- TIMER_STROBE_ON;
+ /*
+ * Disable free-running mode to avoid starting a
+ * new conversion before the ADC handler has read
+ * the ongoing one. This condition could occur
+ * under very high interrupt load and would have the
+ * unwanted effect of reading from the wrong ADC
+ * channel.
+ *
+ * NOTE: writing 0 to ADSC and ADIF has no effect.
+ */
+ ADCSRA = ADCSRA & ~(BV(ADFR) | BV(ADIF) | BV(ADSC));
+
ADC_SETCHN(_adc_idx_next);
- TIMER_STROBE_OFF;
_adc_trigger_lock = true;
}
- #endif
+ #endif // ARCH_BOARD_KC
+
+ /*!
+ * How many timer overflows we must count before calling the real
+ * timer handler.
+ * When the timer is programmed to overflow at 24 kHz, a value of
+ * 24 will result in 1ms between each call.
+ */
+ #define TIMER1_OVF_COUNT 24
+ //#warning TIMER1_OVF_COUNT for timer at 12 kHz
+ //#define TIMER1_OVF_COUNT 12
+
+ static uint8_t count = TIMER1_OVF_COUNT;
+
+ count--;
+ if (!count)
+ {
+ timer_handler();
+ count = TIMER1_OVF_COUNT;
+ }
}
#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
projects / bertos.git / blobdiff