X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=0155ecc7d9a0287b2310b26b50b77fda1103017e;hb=0628041b72ccf33890a673e46b0cd8035acf3a06;hp=7442fdcb152e335d3376a64a54fe1f37e65802aa;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git diff --git a/drv/timer_avr.h b/drv/timer_avr.h index 7442fdcb..0155ecc7 100755 --- a/drv/timer_avr.h +++ b/drv/timer_avr.h @@ -16,6 +16,12 @@ /*#* *#* $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. *#* @@ -97,7 +103,11 @@ #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