From 43b05eb4630fa308c3da80f4e9c655a7daca0ea8 Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Tue, 24 Nov 2015 13:23:29 -0500 Subject: [PATCH] sys_clock: Rename _nano_ticks Renames nanokernel global variable _nano_ticks to _sys_clock_tick_count. Change-Id: I857407f1f7e8d9fd2eedc1c1696851173e58d2b4 Signed-off-by: Peter Mitsis --- include/sys_clock.h | 2 +- kernel/nanokernel/nano_sys_clock.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/sys_clock.h b/include/sys_clock.h index df5ae1c4012..4fa1149e539 100644 --- a/include/sys_clock.h +++ b/include/sys_clock.h @@ -86,7 +86,7 @@ extern int sys_clock_hw_cycles_per_tick; #define SYS_CLOCK_HW_CYCLES_TO_NS(X) (uint32_t)(SYS_CLOCK_HW_CYCLES_TO_NS64(X)) -extern int64_t _nano_ticks; +extern int64_t _sys_clock_tick_count; extern struct nano_timer *_nano_timer_list; /* diff --git a/kernel/nanokernel/nano_sys_clock.c b/kernel/nanokernel/nano_sys_clock.c index db2cd10753d..ba01a89ddc4 100644 --- a/kernel/nanokernel/nano_sys_clock.c +++ b/kernel/nanokernel/nano_sys_clock.c @@ -45,7 +45,7 @@ int sys_clock_hw_cycles_per_sec; int32_t _sys_idle_elapsed_ticks = 1; #endif /* CONFIG_NANOKERNEL */ -int64_t _nano_ticks; +int64_t _sys_clock_tick_count; /** * @@ -56,7 +56,7 @@ int64_t _nano_ticks; */ uint32_t nano_tick_get_32(void) { - return (uint32_t)_nano_ticks; + return (uint32_t)_sys_clock_tick_count; } /** @@ -68,18 +68,18 @@ uint32_t nano_tick_get_32(void) */ int64_t nano_tick_get(void) { - int64_t tmp_nano_ticks; + int64_t tmp_sys_clock_tick_count; /* - * Lock the interrupts when reading _nano_ticks 64-bit variable. + * Lock the interrupts when reading _sys_clock_tick_count 64-bit variable. * Some architectures (x86) do not handle 64-bit atomically, so * we have to lock the timer interrupt that causes change of - * _nano_ticks + * _sys_clock_tick_count */ unsigned int imask = irq_lock(); - tmp_nano_ticks = _nano_ticks; + tmp_sys_clock_tick_count = _sys_clock_tick_count; irq_unlock(imask); - return tmp_nano_ticks; + return tmp_sys_clock_tick_count; } /** @@ -116,14 +116,14 @@ static ALWAYS_INLINE int64_t _nano_tick_delta(int64_t *reftime) int64_t saved; /* - * Lock the interrupts when reading _nano_ticks 64-bit variable. + * Lock the interrupts when reading _sys_clock_tick_count 64-bit variable. * Some architectures (x86) do not handle 64-bit atomically, so * we have to lock the timer interrupt that causes change of - * _nano_ticks + * _sys_clock_tick_count */ unsigned int imask = irq_lock(); - saved = _nano_ticks; + saved = _sys_clock_tick_count; irq_unlock(imask); delta = saved - (*reftime); *reftime = saved; @@ -201,7 +201,7 @@ static inline void handle_expired_nano_timers(int ticks) */ void _nano_sys_clock_tick_announce(int32_t ticks) { - _nano_ticks += ticks; + _sys_clock_tick_count += ticks; handle_expired_nano_timeouts(ticks); handle_expired_nano_timers(ticks); }