Simplify.

[bertos.git] / drv / timer_avr.h

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index 2e2095df5b8e258c6018e9e16dfeb7afbf7aed81..6009dead991d5bb448976f521694261b71da0f03 100755 (executable)
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $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.
  *#*
@@ -55,7 +61,8 @@
 #define DRV_TIMER_AVR_H
 
 #include <arch_config.h> // ARCH_BOARD_KC
-#include "hw.h"
+#include <macros.h> // BV()
+#include <hw.h>
 
 #include <avr/signal.h>
 #include <avr/io.h>
@@ -96,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);
@@ -117,7 +124,7 @@
                TIMSK &= ~BV(TOIE0);
                TIMSK |= BV(OCIE0);
 
-               ENABLE_IRQRESTORE(flags);
+               IRQ_RESTORE(flags);
        }
 
        //! Frequency of the hardware high precision timer
@@ -136,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);
@@ -153,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
@@ -172,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);
@@ -194,7 +201,7 @@
                TIMSK &= ~BV(TOIE2);
                TIMSK |= BV(OCIE2);
 
-               ENABLE_IRQRESTORE(flags);
+               IRQ_RESTORE(flags);
        }
 
        //! Frequency of the hardware high precision timer