michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sys_clock: Change function signature

Browse source 
__ticks_to_ms always return an unsigned value, changing the function
to reflect it.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2018-12-04 16:01:02 -08:00 • committed by Andrew Boie
commit 4323243c62
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/sys_clock.h
View file

@ -125,23 +125,21 @@ static ALWAYS_INLINE s32_t _ms_to_ticks(s32_t ms)
#endif #endif
} }
static inline s64_t __ticks_to_ms(s64_t ticks) static inline u64_t __ticks_to_ms(s64_t ticks)
{ {
#ifdef CONFIG_SYS_CLOCK_EXISTS #ifdef CONFIG_SYS_CLOCK_EXISTS
#ifdef _NEED_PRECISE_TICK_MS_CONVERSION #ifdef _NEED_PRECISE_TICK_MS_CONVERSION
/* use 64-bit math to keep precision */ /* use 64-bit math to keep precision */
return (u64_t)ticks * MSEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC; return (u64_t)ticks * MSEC_PER_SEC / (u64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC;
#else #else
/* simple multiplication keeps precision */ /* simple multiplication keeps precision */
u32_t ms_per_tick = MSEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC; return (u64_t)ticks * MSEC_PER_SEC / (u64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC;
return (u64_t)ticks * ms_per_tick;
#endif #endif
#else #else
__ASSERT(ticks == 0, "ticks not zero"); __ASSERT(ticks == 0, "ticks not zero");
return 0; return 0ULL;
#endif #endif
} }