projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define dac trigger selections.
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
timer_avr.c
diff --git
a/bertos/cpu/avr/drv/timer_avr.c
b/bertos/cpu/avr/drv/timer_avr.c
index ab8329a69e34f2cd559781f1b0861acce45af6f0..ee63e76f8d419846eca22e64845a8f3d527a4556 100644
(file)
--- a/
bertos/cpu/avr/drv/timer_avr.c
+++ b/
bertos/cpu/avr/drv/timer_avr.c
@@
-49,18
+49,18
@@
#include <avr/io.h>
#include <avr/io.h>
-#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA1
68 || CPU_AVR_ATMEGA328P
+#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA1
280 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P || CPU_AVR_ATMEGA2560
#define REG_TIFR0 TIFR0
#define REG_TIFR1 TIFR1
#define REG_TIFR2 TIFR2
#define REG_TIFR0 TIFR0
#define REG_TIFR1 TIFR1
#define REG_TIFR2 TIFR2
- #if CPU_AVR_ATMEGA1281
+ #if CPU_AVR_ATMEGA1281
|| CPU_AVR_ATMEGA1280 || CPU_AVR_ATMEGA2560
#define REG_TIFR3 TIFR3
#endif
#define REG_TIMSK0 TIMSK0
#define REG_TIMSK1 TIMSK1
#define REG_TIMSK2 TIMSK2
#define REG_TIFR3 TIFR3
#endif
#define REG_TIMSK0 TIMSK0
#define REG_TIMSK1 TIMSK1
#define REG_TIMSK2 TIMSK2
- #if CPU_AVR_ATMEGA1281
+ #if CPU_AVR_ATMEGA1281
|| CPU_AVR_ATMEGA1280 || CPU_AVR_ATMEGA2560
#define REG_TIMSK3 TIMSK3
#endif
#define REG_TIMSK3 TIMSK3
#endif
@@
-82,6
+82,7
@@
#define REG_TIFR0 TIFR
#define REG_TIFR1 TIFR
#define REG_TIFR2 TIFR
#define REG_TIFR0 TIFR
#define REG_TIFR1 TIFR
#define REG_TIFR2 TIFR
+ #define REG_TIFR3 TIFR
#define REG_TIMSK0 TIMSK
#define REG_TIMSK1 TIMSK
#define REG_TIMSK0 TIMSK
#define REG_TIMSK1 TIMSK
@@
-215,6
+216,10
@@
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
+ #if CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P || CPU_AVR_ATMEGA32
+ #error For select target there is not TIMER_ON_OVERFLOW3, please select an other one.
+ #endif
+
void timer_hw_init(void)
{
cpu_flags_t flags;
void timer_hw_init(void)
{
cpu_flags_t flags;
@@
-243,7
+248,7
@@
TCNT3 = 0x00;
/* Enable timer interrupt: Timer/Counter3 Overflow */
TCNT3 = 0x00;
/* Enable timer interrupt: Timer/Counter3 Overflow */
- REG_TIMSK3
=
|= BV(TOIE3);
+ REG_TIMSK3 |= BV(TOIE3);
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}