X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Ftimer_avr.h;h=d306cd8a9bd6c9d4a65518fb619cc56b0db149d0;hb=14d17492eae1f0bb9a2baa96b6c149dbf0d81430;hp=de46d1b7fb124f65b4fb2de15ee881a7541fe46e;hpb=d62963b4a64efe8d2917f489fefaf586a9a99126;p=bertos.git

diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h
index de46d1b7..d306cd8a 100644
--- a/bertos/cpu/avr/drv/timer_avr.h
+++ b/bertos/cpu/avr/drv/timer_avr.h
@@ -27,7 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
@@ -35,7 +35,7 @@
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
  *
  */
@@ -43,9 +43,9 @@
 #ifndef DRV_TIMER_AVR_H
 #define DRV_TIMER_AVR_H
 
-#include "hw_cpu.h"        /* CLOCK_FREQ */
+#include "hw/hw_cpu.h"        /* CLOCK_FREQ */
 
-#include <cfg/cfg_timer.h>     /* CONFIG_TIMER */
+#include "cfg/cfg_timer.h"     /* CONFIG_TIMER */
 #include <cfg/compiler.h>  /* uint8_t */
 #include <cfg/macros.h>    /* DIV_ROUND */
 
@@ -73,7 +73,11 @@
 
 	#define TIMER_PRESCALER      64
 	#define TIMER_HW_BITS        8
-	#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0)
+	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
+		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0A)
+	#else
+		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0)
+	#endif
 	#define TIMER_TICKS_PER_SEC  1000
 	#define TIMER_HW_CNT         OCR_DIVISOR