projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comments. Set static prog_flush function.
[bertos.git]
/
drv
/
timer_avr.h
diff --git
a/drv/timer_avr.h
b/drv/timer_avr.h
index 7442fdcb152e335d3376a64a54fe1f37e65802aa..0155ecc7d9a0287b2310b26b50b77fda1103017e 100755
(executable)
--- a/
drv/timer_avr.h
+++ b/
drv/timer_avr.h
@@
-16,6
+16,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.30 2007/06/07 14:35:12 batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.29 2007/03/21 11:01:36 batt
+ *#* Add missing support for ATMega1281.
+ *#*
*#* Revision 1.28 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
*#* Revision 1.28 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
@@
-97,7
+103,11
@@
#define TIMER_PRESCALER 64
#define TIMER_HW_BITS 8
#define TIMER_PRESCALER 64
#define TIMER_HW_BITS 8
- #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE2)
+ #if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
+ #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE2A)
+ #else
+ #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE2)
+ #endif
#define TIMER_TICKS_PER_SEC 1000
/** Value for OCR register in output-compare based timers. */
#define TIMER_HW_CNT OCR_DIVISOR
#define TIMER_TICKS_PER_SEC 1000
/** Value for OCR register in output-compare based timers. */
#define TIMER_HW_CNT OCR_DIVISOR