Module: xenomai-3 Branch: next Commit: 9d6f3383343ec933d0d07953d8989969d90df1be URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=9d6f3383343ec933d0d07953d8989969d90df1be
Author: Philippe Gerum <r...@xenomai.org> Date: Thu Sep 17 04:01:49 2015 +0200 cobalt/arm64: sanitize calibration file --- .../arch/arm64/include/asm/xenomai/calibration.h | 44 +++++--------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/calibration.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/calibration.h index e303a04..e85521e 100644 --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/calibration.h +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/calibration.h @@ -1,13 +1,10 @@ /* - * Copyright (C) 2001,2002,2003,2004,2005 Philippe Gerum <r...@xenomai.org>. + * Copyright (C) 2015 Philippe Gerum <r...@xenomai.org>. * - * ARM port - * Copyright (C) 2005 Stelian Pop - * - * Xenomai is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Xenomai is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, + * or (at your option) any later version. * * Xenomai is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,41 +16,22 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ -#ifndef _COBALT_ARM_ASM_CALIBRATION_H -#define _COBALT_ARM_ASM_CALIBRATION_H - -unsigned int omap_rev(void); -#define cpu_is_omap44xx() ((omap_rev() & 0xff) == 0x44) +#ifndef _COBALT_ARM64_ASM_CALIBRATION_H +#define _COBALT_ARM64_ASM_CALIBRATION_H static inline void xnarch_get_latencies(struct xnclock_gravity *p) { unsigned int ulat; #if CONFIG_XENO_OPT_TIMING_SCHEDLAT != 0 ulat = CONFIG_XENO_OPT_TIMING_SCHEDLAT; -#elif defined(CONFIG_ARCH_AT91RM9200) - ulat = 8500; -#elif defined(CONFIG_ARCH_AT91SAM9263) - ulat = 11000; -#elif defined(CONFIG_SOC_IMX6Q) - ulat = 6000; -#elif defined(CONFIG_ARCH_MX51) - ulat = 5000; -#elif defined(CONFIG_ARCH_MX53) - ulat = 5000; -#elif defined(CONFIG_ARCH_MX6) - ulat = 2000; -#elif defined(CONFIG_SOC_IMX7) - ulat = 2000; -#elif defined(CONFIG_SOC_LS1021A) - ulat = 2800; -#elif defined(CONFIG_ARCH_OMAP) - ulat = cpu_is_omap44xx() ? 2500 : 5000; +#elif defined(CONFIG_ARCH_HISI) + ulat = 4000; #else - ulat = 9500; /* XXX sane? */ + ulat = 4000; #endif p->user = xnclock_ns_to_ticks(&nkclock, ulat); p->kernel = xnclock_ns_to_ticks(&nkclock, CONFIG_XENO_OPT_TIMING_KSCHEDLAT); p->irq = xnclock_ns_to_ticks(&nkclock, CONFIG_XENO_OPT_TIMING_IRQLAT); } -#endif /* !_COBALT_ARM_ASM_CALIBRATION_H */ +#endif /* !_COBALT_ARM64_ASM_CALIBRATION_H */ _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git