Merge branch "preempt" in "trunk".

[bertos.git] / bertos / emul / timer_qt.h

diff --git a/bertos/emul/timer_qt.h b/bertos/emul/timer_qt.h
index 76268fd407d5ad2f5b125f29a7adbd5e355fdc09..1f37c6c91c36beece7e2706f9b0ae32caa31a91f 100644 (file)
--- a/bertos/emul/timer_qt.h
+++ b/bertos/emul/timer_qt.h
@@ -32,7 +32,7 @@
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  *
  * \brief Low-level timer module for Qt emulator (interface).
  */
@@ -41,12 +41,13 @@
 
 // HW dependent timer initialization
 
-#define DEFINE_TIMER_ISR     void timer_isr(void)
+#define DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(timer_isr)
 #define TIMER_TICKS_PER_SEC  250
 #define TIMER_HW_CNT         (1<<31) /* We assume 32bit integers here */
 
 /// Type of time expressed in ticks of the hardware high-precision timer.
 typedef unsigned int hptime_t;
+#define SIZEOF_HPTIME_T 4
 
 /// Frequency of the hardware high-precision timer.
 #define TIMER_HW_HPTICKS_PER_SEC  1000