Merge branch "preempt" in "trunk".

[bertos.git] / bertos / cpu / arm / drv / timer_at91.h

diff --git a/bertos/cpu/arm/drv/timer_at91.h b/bertos/cpu/arm/drv/timer_at91.h
index 54ba6e37f37f6d693e981b5693aba5954b161eb5..68e5561e03e9894721d3ff477e19d7f221b49982 100644 (file)
--- a/bertos/cpu/arm/drv/timer_at91.h
+++ b/bertos/cpu/arm/drv/timer_at91.h
@@ -64,9 +64,13 @@
  */
 #if (CONFIG_TIMER == TIMER_ON_PIT)
 
-       void timer_handler(void);
+       /*
+        * On ARM all IRQs are handled by the sysirq_dispatcher, so the actual
+        * timer handler can be treated like any other normal routine.
+        */
+       #define DEFINE_TIMER_ISR        void timer_handler(void);       \
+                                       void timer_handler(void)
 
-       #define DEFINE_TIMER_ISR     void timer_handler(void)
        #define TIMER_TICKS_PER_SEC  1000
        #define TIMER_HW_CNT         (CPU_FREQ / (16 * TIMER_TICKS_PER_SEC) - 1)
 
@@ -75,6 +79,7 @@
 
        /** Type of time expressed in ticks of the hardware high-precision timer */
        typedef uint32_t hptime_t;
+       #define SIZEOF_HPTIME_T 4
 
        INLINE void timer_hw_irq(void)
        {