X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=6009dead991d5bb448976f521694261b71da0f03;hb=f76621bb61f5830efac4a110760ae357d0ffab0f;hp=a530136414a231881a55b5d8508c55a804047626;hpb=73037040c1e642ddc06f56ea0db6793d67d56023;p=bertos.git

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index a5301364..6009dead 100755
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -15,6 +15,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.22  2005/01/23 12:26:07  bernie
+ *#* Add missing header.
+ *#*
+ *#* 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.
  *#*
@@ -52,10 +61,11 @@
 #define DRV_TIMER_AVR_H
 
 #include <arch_config.h> // ARCH_BOARD_KC
-#include "hw.h"
+#include <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>
@@ -93,7 +103,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);
@@ -114,7 +124,7 @@
 		TIMSK &= ~BV(TOIE0);
 		TIMSK |= BV(OCIE0);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer
@@ -133,7 +143,7 @@
 	static void timer_hw_init(void)
 	{
 		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
+		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer overflow flag */
 		TIFR |= BV(TOV1);
@@ -150,7 +160,7 @@
 		/* Enable timer interrupt: Timer/Counter1 Overflow */
 		TIMSK |= BV(TOIE1);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer
@@ -169,7 +179,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);
@@ -191,7 +201,7 @@
 		TIMSK &= ~BV(TOIE2);
 		TIMSK |= BV(OCIE2);
 
-		ENABLE_IRQRESTORE(flags);
+		IRQ_RESTORE(flags);
 	}
 
 	//! Frequency of the hardware high precision timer