Merge da SC: fixato namespace dell'include guard

[bertos.git] / drv / timer_avr.h

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index b536c95393e4a6744e327a86387779c6c355b7ff..24db1bcf8102d33d68809b2f5c809a489d3a55a6 100755 (executable)
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * Revision 1.11  2004/08/03 15:53:17  aleph
+ * Fix spacing
+ *
+ * Revision 1.10  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
+ *
  * Revision 1.9  2004/07/22 02:01:14  bernie
  * Use TIMER_PRESCALER consistently.
  *
@@ -157,8 +163,13 @@
                TIFR = BV(OCF2) | BV(TOV2);
 
                /* Setup Timer/Counter interrupt */
-#warning Aleph, please use TIMER_PRESCALER here
-               TCCR2 = BV(WGM21) | BV(CS21) | BV(CS20);
+               TCCR2 = BV(WGM21)
+                       #if TIMER_PRESCALER == 64
+                               | BV(CS21) | BV(CS20)
+                       #else
+                               #error Unsupported value of TIMER_PRESCALER
+                       #endif
+               ;
                /* Clear on Compare match & prescaler = 64, internal sys clock.
                   When changing prescaler change TIMER_HW_HPTICKS_PER_SEC too */
                TCNT2 = 0x00;         /* initialization of Timer/Counter */