aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Savolainen <petri.savolainen@nokia.com>2015-09-08 11:31:32 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-10-22 15:44:30 +0300
commit5126cc512634179654542492d067ebd3b63b23ec (patch)
treeef56e421ec07d234b527c23aa9dd4335f4fcdde7
parentd6f6e9ea0a4d6dd1bba3059da7fc3151c1e25e5b (diff)
linux-generic: cpu: created arch depedent cpu_cycles files
Renamed time_cycles files to cpu_cycles, since those files implement cpu cycle counter read needed by cpu API but not needed by new time API. Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com> Reviewed-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--platform/linux-generic/Makefile.am8
-rw-r--r--platform/linux-generic/arch/linux/odp_cpu_cycles.c (renamed from platform/linux-generic/arch/linux/odp_time_cycles.c)4
-rw-r--r--platform/linux-generic/arch/mips64/odp_cpu_cycles.c (renamed from platform/linux-generic/arch/mips64/odp_time_cycles.c)0
-rw-r--r--platform/linux-generic/arch/x86/odp_cpu_cycles.c (renamed from platform/linux-generic/arch/x86/odp_time_cycles.c)0
4 files changed, 6 insertions, 6 deletions
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index dfb5a91b9..33f4a0bd6 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -169,12 +169,12 @@ __LIB__libodp_la_SOURCES = \
odp_timer.c \
odp_version.c \
odp_weak.c \
- arch/@ARCH@/odp_time_cycles.c
+ arch/@ARCH@/odp_cpu_cycles.c
EXTRA_DIST = \
- arch/linux/odp_time_cycles.c \
- arch/mips64/odp_time_cycles.c \
- arch/x86/odp_time_cycles.c
+ arch/linux/odp_cpu_cycles.c \
+ arch/mips64/odp_cpu_cycles.c \
+ arch/x86/odp_cpu_cycles.c
if HAVE_PCAP
__LIB__libodp_la_SOURCES += pktio/pcap.c
diff --git a/platform/linux-generic/arch/linux/odp_time_cycles.c b/platform/linux-generic/arch/linux/odp_cpu_cycles.c
index 4dc0764ed..256ad7cac 100644
--- a/platform/linux-generic/arch/linux/odp_time_cycles.c
+++ b/platform/linux-generic/arch/linux/odp_cpu_cycles.c
@@ -28,8 +28,8 @@ uint64_t odp_time_cycles(void)
ODP_ABORT("clock_gettime failed\n");
hz = odp_sys_cpu_hz();
- sec = (uint64_t) time.tv_sec;
- ns = (uint64_t) time.tv_nsec;
+ sec = (uint64_t)time.tv_sec;
+ ns = (uint64_t)time.tv_nsec;
cycles = sec * hz;
cycles += (ns * hz) / GIGA;
diff --git a/platform/linux-generic/arch/mips64/odp_time_cycles.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
index 4fb790b19..4fb790b19 100644
--- a/platform/linux-generic/arch/mips64/odp_time_cycles.c
+++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
diff --git a/platform/linux-generic/arch/x86/odp_time_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c
index a11156184..a11156184 100644
--- a/platform/linux-generic/arch/x86/odp_time_cycles.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c