projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
[bertos.git]
/
drv
/
timer_avr.h
diff --git
a/drv/timer_avr.h
b/drv/timer_avr.h
index a530136414a231881a55b5d8508c55a804047626..52dea9cf362d754525e631114c2f169b6e0bf127 100755
(executable)
--- a/
drv/timer_avr.h
+++ b/
drv/timer_avr.h
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $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.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.
*#*
@@
-54,8
+60,8
@@
#include <arch_config.h> // ARCH_BOARD_KC
#include "hw.h"
#include <arch_config.h> // ARCH_BOARD_KC
#include "hw.h"
-#include <avr/wdt.h>
#include <avr/signal.h>
#include <avr/signal.h>
+#include <avr/io.h>
#if defined(ARCH_BOARD_KC) && (ARCH & ARCH_BOARD_KC)
#include <drv/adc.h>
#if defined(ARCH_BOARD_KC) && (ARCH & ARCH_BOARD_KC)
#include <drv/adc.h>
@@
-93,7
+99,7
@@
static void timer_hw_init(void)
{
cpuflags_t flags;
static void timer_hw_init(void)
{
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
/* Reset Timer flags */
TIFR = BV(OCF0) | BV(TOV0);
/* Reset Timer flags */
TIFR = BV(OCF0) | BV(TOV0);
@@
-114,7
+120,7
@@
TIMSK &= ~BV(TOIE0);
TIMSK |= BV(OCIE0);
TIMSK &= ~BV(TOIE0);
TIMSK |= BV(OCIE0);
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
}
//! Frequency of the hardware high precision timer
}
//! Frequency of the hardware high precision timer
@@
-133,7
+139,7
@@
static void timer_hw_init(void)
{
cpuflags_t flags;
static void timer_hw_init(void)
{
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
/* Reset Timer overflow flag */
TIFR |= BV(TOV1);
/* Reset Timer overflow flag */
TIFR |= BV(TOV1);
@@
-150,7
+156,7
@@
/* Enable timer interrupt: Timer/Counter1 Overflow */
TIMSK |= BV(TOIE1);
/* Enable timer interrupt: Timer/Counter1 Overflow */
TIMSK |= BV(TOIE1);
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
}
//! Frequency of the hardware high precision timer
}
//! Frequency of the hardware high precision timer
@@
-169,7
+175,7
@@
static void timer_hw_init(void)
{
cpuflags_t flags;
static void timer_hw_init(void)
{
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
/* Reset Timer flags */
TIFR = BV(OCF2) | BV(TOV2);
/* Reset Timer flags */
TIFR = BV(OCF2) | BV(TOV2);
@@
-191,7
+197,7
@@
TIMSK &= ~BV(TOIE2);
TIMSK |= BV(OCIE2);
TIMSK &= ~BV(TOIE2);
TIMSK |= BV(OCIE2);
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
}
//! Frequency of the hardware high precision timer
}
//! Frequency of the hardware high precision timer