Module: xenomai-2.6
Branch: master
Commit: 28984e66e9e17701354f8883b025fcf83f8b0b68
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=28984e66e9e17701354f8883b025fcf83f8b0b68

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Wed Oct  3 23:34:50 2012 +0200

hal/x86: fix timer calibration for non I-pipe core

---

 ksrc/arch/x86/hal_32.c |    6 +-----
 ksrc/arch/x86/hal_64.c |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ksrc/arch/x86/hal_32.c b/ksrc/arch/x86/hal_32.c
index 1a362e7..28bd0fe 100644
--- a/ksrc/arch/x86/hal_32.c
+++ b/ksrc/arch/x86/hal_32.c
@@ -75,11 +75,7 @@ unsigned long rthal_timer_calibrate(void)
        rthal_time_t t, dt;
        int i;
 
-#ifndef CONFIG_IPIPE_CORE
-       v = 1;
-#else /* I-pipe core */
-       v = RTHAL_TIMER_FREQ / HZ;
-#endif /* I-pipe core */
+       v = RTHAL_COMPAT_TIMERFREQ / HZ;
 
        flags = rthal_critical_enter(NULL);
 
diff --git a/ksrc/arch/x86/hal_64.c b/ksrc/arch/x86/hal_64.c
index b2f6229..c1a9f1e 100644
--- a/ksrc/arch/x86/hal_64.c
+++ b/ksrc/arch/x86/hal_64.c
@@ -51,11 +51,7 @@ unsigned long rthal_timer_calibrate(void)
        rthal_time_t t, dt;
        int i;
 
-#ifndef CONFIG_IPIPE_CORE
-       v = 1;
-#else /* I-pipe core */
-       v = RTHAL_TIMER_FREQ / HZ;
-#endif /* I-pipe core */
+       v = RTHAL_COMPAT_TIMERFREQ / HZ;
 
        flags = rthal_critical_enter(NULL);
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to