/*
* $Log$
+ * Revision 1.15 2004/08/10 06:59:09 bernie
+ * timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
+ *
+ * Revision 1.12 2004/07/30 14:34:10 rasky
+ * Vari fix per documentazione e commenti
+ * Aggiunte PP_CATn e STATIC_ASSERT
+ *
+ * Revision 1.11 2004/07/29 22:40:12 bernie
+ * Spelling fix.
+ *
* Revision 1.10 2004/07/21 00:13:57 bernie
* Put timer driver on diet.
*
#include "cpu.h"
#include "compiler.h"
+#include <config.h>
#include <mware/list.h>
/*! Number of timer ticks per second. */
-#define TICKS_PER_SEC 1000
+#define TICKS_PER_SEC ((time_t)1000)
/* Function protos */
extern void timer_init(void);
#endif
/*!
- * The timer driver supports multiple ssynchronous timers
+ * The timer driver supports multiple synchronous timers
* that can trigger an event when they expire.
*
* \sa timer_add()
*
* The following code is safe:
*
- * \example
+ * \code
* time_t tea_start_time = get_tick();
*
* boil_water();
*
* if (get_tick() - tea_start_time > TEAPOT_DELAY)
* printf("Your tea, Sir.\n");
- * \endexample
+ * \endcode
*
* When the tick counter increments every millisecond and time_t
* is 32bit wide, the tick count will overflow every 49.7 days.
* clock variable is larger than the processor word size and can't
* be copied atomically.
*/
-INLINE time_t timer_tick(void)
+INLINE time_t timer_ticks(void)
{
time_t result;
cpuflags_t flags;
return result;
}
-/* OBSOLETE */
-#define timer_gettick timer_tick
+DEPRECATED INLINE time_t timer_gettick(void)
+{
+ return timer_ticks();
+}
/*!
- * Faster version of timer_tick(), to be called only when the timer
+ * Faster version of timer_ticks(), to be called only when the timer
* interrupt is disabled (DISABLE_INTS) or overridden by a
* higher-priority or non-nesting interrupt.
*
- * \sa timer_tick
+ * \sa timer_ticks
*/
-INLINE time_t timer_tick_unlocked(void)
+INLINE time_t timer_ticks_unlocked(void)
{
return _clock;
}
-/* OBSOLETE */
-#define timer_gettick_irq timer_tick_unlocked
+DEPRECATED INLINE time_t timer_gettick_irq(void)
+{
+ return timer_ticks_unlocked();
+}
+
+
+/*!
+ * Return the minutes passed since timer start.
+ *
+ * The minutes uptime is computed directly from system tick counter:
+ * in case of a 4 bytes time_t after 71582 minutes the value will
+ * wrap around.
+ */
+INLINE time_t timer_minutes(void)
+{
+ return timer_ticks() / (TICKS_PER_SEC * 60);
+}
#endif /* DRV_TIMER_H */