From 162f8bb0fee63e2511fdd8a607b347b826487f6f Mon Sep 17 00:00:00 2001 From: aleph Date: Tue, 3 Aug 2004 15:50:03 +0000 Subject: [PATCH] Rename timer_tick() to timer_ticks() git-svn-id: https://src.develer.com/svnoss/bertos/trunk@100 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/timer.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drv/timer.h b/drv/timer.h index 3180e1b8..09d97c13 100755 --- a/drv/timer.h +++ b/drv/timer.h @@ -15,6 +15,9 @@ /* * $Log$ + * Revision 1.14 2004/08/03 15:50:03 aleph + * Rename timer_tick() to timer_ticks() + * * Revision 1.13 2004/08/02 20:20:29 aleph * Merge from project_ks * @@ -152,7 +155,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; @@ -165,23 +168,23 @@ INLINE time_t timer_tick(void) } /* OBSOLETE */ -#define timer_gettick timer_tick +#define timer_gettick 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 +#define timer_gettick_irq timer_ticks_unlocked /*! @@ -193,7 +196,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 */ -- 2.25.1