CONFIG_TIMER_STROBE: Define no-op default macros.

[bertos.git] / drv / timer.h

diff --git a/drv/timer.h b/drv/timer.h
index 3180e1b81e8e914aa3baf23adfa5ea3037271108..d88168f078e816299845d678453e81706bbd40c9 100755 (executable)
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,8 +15,8 @@
 
 /*
  * $Log$
- * Revision 1.13  2004/08/02 20:20:29  aleph
- * Merge from project_ks
+ * 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
@@ -152,7 +152,7 @@ extern volatile time_t _clock;
  * 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;
@@ -164,24 +164,28 @@ INLINE time_t timer_tick(void)
        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();
+}
 
 
 /*!
@@ -193,7 +197,7 @@ INLINE time_t timer_tick_unlocked(void)
  */
 INLINE time_t timer_minutes(void)
 {
-       return timer_gettick() / (TICKS_PER_SEC * 60);
+       return timer_ticks() / (TICKS_PER_SEC * 60);
 }
 
 #endif /* DRV_TIMER_H */