Fix error on short hptime_t CPU.

[bertos.git] / bertos / drv / timer.h

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 6ae1907e6863ca5b2e182b694811e5a1eaab25c0..40802b543cb9f981f909e6c731fc1e17a8e499b9 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -30,10 +30,23 @@
  * Copyright 2000, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \brief Hardware independent timer driver (interface)
+ * \brief Hardware independent timer driver.
+ *
+ * All timer related functions are implemented in this module. You have several options to use timers:
+ * \li simple delay: just use timer_delay() if you want to wait for a few milliseconds;
+ * \li delay with callback: create a timer structure and use timer_setDelay() and timer_setSoftint() to set the callback;
+ * \li delay with signal: same as above but use timer_setSignal() to set specify which signal to send.
+ *
+ * Whenever a timer expires you need to explicitly arm it again with timer_add(). If you want to abort a timer, use timer_abort().
+ * You can use conversion macros when using msecs to specify the delay.
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * $WIZ$ module_name = "timer"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_timer.h"
+ * $WIZ$ module_depends = "event", "sysirq"
+ * $WIZ$ module_supports = "not atmega103 and not atmega8"
  */
 
 #ifndef DRV_TIMER_H
@@ -57,6 +70,8 @@
        #include CPU_HEADER(timer)
 #endif
 
+STATIC_ASSERT(sizeof(hptime_t) == SIZEOF_HPTIME_T);
+
 #include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
@@ -107,6 +122,7 @@ extern volatile ticks_t _clock;
  * \note This function must disable interrupts on 8/16bit CPUs because the
  * clock variable is larger than the processor word size and can't
  * be copied atomically.
+ * \sa timer_delay()
  */
 INLINE ticks_t timer_clock(void)
 {
@@ -198,6 +214,12 @@ INLINE utime_t hptime_to_us(hptime_t hpticks)
 }
 
 void timer_delayTicks(ticks_t delay);
+/**
+ * Wait some time [ms].
+ *
+ * \note CPU is released while waiting so you don't have to call cpu_relax() explicitly.
+ * \param delay Time to wait [ms].
+ */
 INLINE void timer_delay(mtime_t delay)
 {
        timer_delayTicks(ms_to_ticks(delay));
@@ -239,7 +261,7 @@ typedef struct Timer
        DB(uint16_t magic;)
 } Timer;
 
-/** Timer is active when Timer.magic contains this value (for debugging purposes). */
+/* Timer is active when Timer.magic contains this value (for debugging purposes). */
 #define TIMER_MAGIC_ACTIVE    0xABBA
 #define TIMER_MAGIC_INACTIVE  0xBAAB
 
@@ -249,12 +271,9 @@ Timer *timer_abort(Timer *timer);
 /** Set the timer so that it calls an user hook when it expires */
 INLINE void timer_setSoftint(Timer *timer, Hook func, iptr_t user_data)
 {
-       event_initSoftInt(&timer->expire, func, user_data);
+       event_initSoftint(&timer->expire, func, user_data);
 }
 
-// OBSOLETE
-#define  timer_set_event_softint timer_setSoftint
-
 /** Set the timer delay (the time before the event will be triggered) */
 INLINE void timer_setDelay(Timer *timer, ticks_t delay)
 {