Module: xenomai-head Branch: master Commit: 3dade1dbb60f2339c54edac326cb093f6f299526 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=3dade1dbb60f2339c54edac326cb093f6f299526
Author: Philippe Gerum <r...@xenomai.org> Date: Tue May 19 17:31:47 2009 +0200 Rename imuldiv_up to imuldiv_ceil --- include/asm-arm/bits/timer.h | 2 +- include/asm-generic/arith.h | 14 +++++++------- include/asm-powerpc/bits/timer.h | 2 +- include/asm-x86/bits/timer.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/asm-arm/bits/timer.h b/include/asm-arm/bits/timer.h index 9433b43..c68e268 100644 --- a/include/asm-arm/bits/timer.h +++ b/include/asm-arm/bits/timer.h @@ -29,7 +29,7 @@ static inline void xnarch_program_timer_shot(unsigned long delay) { - rthal_timer_program_shot(rthal_imuldiv_up + rthal_timer_program_shot(rthal_imuldiv_ceil (delay, RTHAL_TIMER_FREQ, RTHAL_CPU_FREQ)); } diff --git a/include/asm-generic/arith.h b/include/asm-generic/arith.h index 5ef3544..fc09b43 100644 --- a/include/asm-generic/arith.h +++ b/include/asm-generic/arith.h @@ -158,17 +158,17 @@ static inline __attribute__((__const__)) int __rthal_generic_imuldiv(int i, #define rthal_imuldiv(i,m,d) __rthal_generic_imuldiv((i),(m),(d)) #endif /* !rthal_imuldiv */ -#ifndef rthal_imuldiv_up -static inline __attribute__((__const__)) int __rthal_generic_imuldiv_up(int i, - int mult, - int div) +#ifndef rthal_imuldiv_ceil +static inline __attribute__((__const__)) int __rthal_generic_imuldiv_ceil(int i, + int mult, + int div) { /* Same as __rthal_generic_imuldiv, rounding up. */ const unsigned long long ull = rthal_ullmul(i, mult); return rthal_uldivrem(ull + div - 1, div, NULL); } -#define rthal_imuldiv_up(i,m,d) __rthal_generic_imuldiv_up((i),(m),(d)) -#endif /* !rthal_imuldiv_up */ +#define rthal_imuldiv_ceil(i,m,d) __rthal_generic_imuldiv_ceil((i),(m),(d)) +#endif /* !rthal_imuldiv_ceil */ /* Division of an unsigned 96 bits ((h << 32) + l) by an unsigned 32 bits. Building block for llimd. Without const qualifiers, gcc reload registers @@ -380,7 +380,7 @@ static inline void xnarch_init_llmulshft(const unsigned m_in, #define xnarch_mod64(a,b) ({ unsigned long long _rem; \ rthal_divmod64((a),(b),&_rem); _rem; }) #define xnarch_imuldiv rthal_imuldiv -#define xnarch_imuldiv_up rthal_imuldiv_up +#define xnarch_imuldiv_ceil rthal_imuldiv_ceil #define xnarch_llimd rthal_llimd #define xnarch_nodiv_llimd rthal_nodiv_llimd #define xnarch_llmulshft rthal_llmulshft diff --git a/include/asm-powerpc/bits/timer.h b/include/asm-powerpc/bits/timer.h index 0bccb7a..b61f496 100644 --- a/include/asm-powerpc/bits/timer.h +++ b/include/asm-powerpc/bits/timer.h @@ -36,7 +36,7 @@ static inline void xnarch_program_timer_shot(unsigned long delay) * extra call to the tick handler would simply occur after 4 * billions ticks. */ - rthal_timer_program_shot(rthal_imuldiv_up + rthal_timer_program_shot(rthal_imuldiv_ceil (delay, RTHAL_TIMER_FREQ, RTHAL_CPU_FREQ)); } diff --git a/include/asm-x86/bits/timer.h b/include/asm-x86/bits/timer.h index 54aee83..3cfb0af 100644 --- a/include/asm-x86/bits/timer.h +++ b/include/asm-x86/bits/timer.h @@ -32,7 +32,7 @@ static inline void xnarch_program_timer_shot(unsigned long delay) * now. Would a timer needs more, an extra call to the tick * handler would simply occur after 4 billions ticks. */ - rthal_timer_program_shot(rthal_imuldiv_up + rthal_timer_program_shot(rthal_imuldiv_ceil (delay, RTHAL_TIMER_FREQ, RTHAL_CPU_FREQ)); #ifdef CONFIG_XENO_HW_NMI_DEBUG_LATENCY { _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git