Rename kernel's clock_vars.h to sys_clock.h
The revised name better reflects the fact that the file defines
macros in addition to declaring variables. In addition, most of
these APIs use the "sys_clock_" prefix, which aligns well with
the new file name.
Change-Id: Ib33517d4b19ec2455303b87200c677e87640fcbc
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
diff --git a/arch/arc/timer/arcv2_timer0.c b/arch/arc/timer/arcv2_timer0.c
index 02f1483..3b9bbb7 100644
--- a/arch/arc/timer/arcv2_timer0.c
+++ b/arch/arc/timer/arcv2_timer0.c
@@ -45,7 +45,7 @@
#include <sections.h>
#include <misc/__assert.h>
#include <arch/arc/v2/aux_regs.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
/*
diff --git a/arch/arm/timer/systick.c b/arch/arm/timer/systick.c
index 6232630..d490423 100644
--- a/arch/arm/timer/systick.c
+++ b/arch/arm/timer/systick.c
@@ -55,7 +55,7 @@
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
#ifdef CONFIG_MICROKERNEL
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index 17aad22..f4c4da9 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -67,7 +67,7 @@
#include <nanokernel.h>
#include <toolchain.h>
#include <sections.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
#ifdef CONFIG_MICROKERNEL
diff --git a/drivers/timer/i8253.c b/drivers/timer/i8253.c
index 6376ddf..2f3b9c6 100644
--- a/drivers/timer/i8253.c
+++ b/drivers/timer/i8253.c
@@ -53,7 +53,7 @@
#include <toolchain.h>
#include <sections.h>
#include <limits.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
#ifdef CONFIG_MICROKERNEL
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index f1f16be..6892c7a 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -46,7 +46,7 @@
#include <nanokernel.h>
#include <toolchain.h>
#include <sections.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
#include <drivers/loapic.h> /* LOAPIC registers */
diff --git a/include/microkernel/ticks.h b/include/microkernel/ticks.h
index 8843f03..48313d1 100644
--- a/include/microkernel/ticks.h
+++ b/include/microkernel/ticks.h
@@ -34,7 +34,7 @@
#define TICKS_H
#include <nanokernel.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
/* externs */
diff --git a/include/nanokernel.h b/include/nanokernel.h
index 1a57472..2676011 100644
--- a/include/nanokernel.h
+++ b/include/nanokernel.h
@@ -42,7 +42,7 @@
/* generic kernel public APIs */
#include <kernel_version.h>
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/rand32.h>
#ifdef __cplusplus
diff --git a/include/clock_vars.h b/include/sys_clock.h
similarity index 97%
rename from include/clock_vars.h
rename to include/sys_clock.h
index ed57286..db630bd 100644
--- a/include/clock_vars.h
+++ b/include/sys_clock.h
@@ -37,8 +37,8 @@
that use timer functionality.
*/
-#ifndef _CLOCK_VARS__H_
-#define _CLOCK_VARS__H_
+#ifndef _SYS_CLOCK__H_
+#define _SYS_CLOCK__H_
#ifndef _ASMLANGUAGE
#include <stdint.h>
@@ -82,4 +82,4 @@
#endif /* !_ASMLANGUAGE */
-#endif /* _CLOCK_VARS__H_ */
+#endif /* _SYS_CLOCK__H_ */
diff --git a/kernel/nanokernel/int_latency_bench.c b/kernel/nanokernel/int_latency_bench.c
index 0023e47..68a3bcc 100644
--- a/kernel/nanokernel/int_latency_bench.c
+++ b/kernel/nanokernel/int_latency_bench.c
@@ -37,7 +37,7 @@
#include <stdint.h> /* uint32_t */
#include <limits.h> /* ULONG_MAX */
#include <misc/printk.h> /* printk */
-#include <clock_vars.h>
+#include <sys_clock.h>
#include <drivers/system_timer.h>
#define NB_CACHE_WARMING_DRY_RUN 7
diff --git a/kernel/nanokernel/nano_sys_clock.c b/kernel/nanokernel/nano_sys_clock.c
index 95672d6..0742499 100644
--- a/kernel/nanokernel/nano_sys_clock.c
+++ b/kernel/nanokernel/nano_sys_clock.c
@@ -215,7 +215,7 @@
/* handle the expired nano timers in the nano timers queue */
#ifdef CONFIG_NANO_TIMERS
-#include <clock_vars.h>
+#include <sys_clock.h>
static inline void handle_expired_nano_timers(int ticks)
{
if (_nano_timer_list) {
