Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / drv / timer_avr.h

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
old mode 100755 (executable)
new mode 100644 (file)
index 7442fdc..c4bff65
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -16,6 +16,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.32  2007/10/08 12:14:32  batt
+ *#* Fix some review issues.
+ *#*
+ *#* Revision 1.31  2007/10/07 12:30:55  batt
+ *#* Add default timer for AVR.
+ *#*
+ *#* 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.
  *#*
@@ -65,6 +77,8 @@
 #define TIMER_ON_OVERFLOW1        2
 #define TIMER_ON_OUTPUT_COMPARE2  3
 #define TIMER_ON_OVERFLOW3        4
+
+#define TIMER_DEFAULT TIMER_ON_OUTPUT_COMPARE0 ///< Default system timer
 /* \} */
 
 /*
@@ -97,7 +111,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
@@ -135,5 +153,8 @@
 /** Not needed, IRQ timer flag cleared automatically */
 #define timer_hw_irq() do {} while (0)
 
+/** Not needed, timer IRQ handler called only for timer source */
+#define timer_hw_triggered() (true)
+
 
 #endif /* DRV_TIMER_AVR_H */