X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=d308608aedf3adca7e2553912a64ca325511b92b;hb=25909cdf6e3cb243846a002cf704af8357d0ec4c;hp=f8dbaa3dc980a36ecec843d0b45a7fa7d2f3e9c6;hpb=1c1d44f608c88fbabd0fb73a7f3bc4e5824e4954;p=bertos.git

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index f8dbaa3d..d308608a 100755
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -1,9 +1,9 @@
 /*!
  * \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$
@@ -15,6 +15,21 @@
 
 /*#*
  *#* $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.
+ *#*
  *#* Revision 1.18  2004/09/20 03:31:03  bernie
  *#* Fix racy racy code.
  *#*
@@ -48,11 +63,12 @@
 #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>
@@ -70,23 +86,6 @@
 #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)
 
@@ -107,7 +106,7 @@
 	static void timer_hw_init(void)
 	{
 		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
+		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer flags */
 		TIFR = BV(OCF0) | BV(TOV0);
@@ -128,7 +127,7 @@
 		TIMSK &= ~BV(TOIE0);
 		TIMSK |= BV(OCIE0);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer
@@ -147,7 +146,7 @@
 	static void timer_hw_init(void)
 	{
 		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
+		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer overflow flag */
 		TIFR |= BV(TOV1);
@@ -164,7 +163,7 @@
 		/* Enable timer interrupt: Timer/Counter1 Overflow */
 		TIMSK |= BV(TOIE1);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer
@@ -183,7 +182,7 @@
 	static void timer_hw_init(void)
 	{
 		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
+		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer flags */
 		TIFR = BV(OCF2) | BV(TOV2);
@@ -205,7 +204,7 @@
 		TIMSK &= ~BV(TOIE2);
 		TIMSK |= BV(OCIE2);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer
@@ -254,6 +253,11 @@
 
 		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
@@ -264,7 +268,7 @@
 			 *
 			 * 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;