Module: xenomai-2.6
Branch: master
Commit: 027f99903bc69cfd0422cfc0f93e032ed327f8ae
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=027f99903bc69cfd0422cfc0f93e032ed327f8ae
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Sat Sep 1 14:15:40 2012 +0200
hal: replace all remaining references to cpu frequency with clock frequency
---
include/asm-blackfin/bits/init.h | 2 +-
include/asm-x86/bits/init_32.h | 2 +-
include/asm-x86/bits/init_64.h | 2 +-
include/asm-x86/bits/timer.h | 2 +-
ksrc/arch/blackfin/hal.c | 2 +-
ksrc/arch/generic/hal.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/asm-blackfin/bits/init.h b/include/asm-blackfin/bits/init.h
index a157b79..36d4baf 100644
--- a/include/asm-blackfin/bits/init.h
+++ b/include/asm-blackfin/bits/init.h
@@ -84,7 +84,7 @@ static inline int xnarch_init(void)
set_cpus_allowed(current, cpumask_of_cpu(0));
#endif /* CONFIG_SMP && MODULE */
- xnarch_init_timeconv(RTHAL_CPU_FREQ);
+ xnarch_init_timeconv(RTHAL_CLOCK_FREQ);
ret = xnarch_calibrate_sched();
if (ret)
diff --git a/include/asm-x86/bits/init_32.h b/include/asm-x86/bits/init_32.h
index 589a845..92f3692 100644
--- a/include/asm-x86/bits/init_32.h
+++ b/include/asm-x86/bits/init_32.h
@@ -89,7 +89,7 @@ static inline int xnarch_init(void)
set_cpus_allowed(current, cpumask_of_cpu(0));
#endif /* CONFIG_SMP && MODULE */
- xnarch_init_timeconv(RTHAL_CPU_FREQ);
+ xnarch_init_timeconv(RTHAL_CLOCK_FREQ);
ret = xnarch_calibrate_sched();
if (ret)
diff --git a/include/asm-x86/bits/init_64.h b/include/asm-x86/bits/init_64.h
index 922d9c4..a5d62ac 100644
--- a/include/asm-x86/bits/init_64.h
+++ b/include/asm-x86/bits/init_64.h
@@ -86,7 +86,7 @@ static inline int xnarch_init(void)
set_cpus_allowed(current, cpumask_of_cpu(0));
#endif /* CONFIG_SMP && MODULE */
- xnarch_init_timeconv(RTHAL_CPU_FREQ);
+ xnarch_init_timeconv(RTHAL_CLOCK_FREQ);
ret = xnarch_calibrate_sched();
if (ret)
diff --git a/include/asm-x86/bits/timer.h b/include/asm-x86/bits/timer.h
index a0cfa02..1836c81 100644
--- a/include/asm-x86/bits/timer.h
+++ b/include/asm-x86/bits/timer.h
@@ -34,7 +34,7 @@ static inline void xnarch_program_timer_shot(unsigned long
delay)
* handler would simply occur after 4 billions ticks.
*/
rthal_timer_program_shot(rthal_imuldiv_ceil
- (delay, RTHAL_TIMER_FREQ, RTHAL_CPU_FREQ));
+ (delay, RTHAL_TIMER_FREQ, RTHAL_CLOCK_FREQ));
#else
rthal_timer_program_shot(delay);
#endif
diff --git a/ksrc/arch/blackfin/hal.c b/ksrc/arch/blackfin/hal.c
index 1c654c3..eec58ee 100644
--- a/ksrc/arch/blackfin/hal.c
+++ b/ksrc/arch/blackfin/hal.c
@@ -340,7 +340,7 @@ EXPORT_SYMBOL_GPL(rthal_timer_notify_switch);
unsigned long rthal_timer_calibrate(void)
{
- return (1000000000 / RTHAL_CPU_FREQ) * 100; /* 100 CPU cycles --
FIXME */
+ return (1000000000 / RTHAL_CLOCK_FREQ) * 100; /* 100 CPU cycles --
FIXME */
}
int rthal_irq_enable(unsigned irq)
diff --git a/ksrc/arch/generic/hal.c b/ksrc/arch/generic/hal.c
index 3199792..ac6c171 100644
--- a/ksrc/arch/generic/hal.c
+++ b/ksrc/arch/generic/hal.c
@@ -554,7 +554,7 @@ int rthal_init(void)
*/
/* check the CPU frequency first and abort if it's invalid */
- if (rthal_cpufreq_arg == 0) {
+ if (rthal_clockfreq_arg == 0) {
printk(KERN_ERR "Xenomai has detected a CPU frequency of 0.
Aborting.\n");
return -ENODEV;
}
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
