linux-gen, include: switch time.h to api+abi

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

8 files changed, 102 insertions, 0 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 0d48219ea..aeadb2e28 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -75,6 +75,7 @@ odpapiabidefaultinclude_HEADERS = \
 	odp/api/abi-default/spinlock_recursive.h \
 	odp/api/abi-default/thread.h \
 	odp/api/abi-default/thrmask.h \
+	odp/api/abi-default/time.h \
 	odp/api/abi-default/version.h
 
 # Insall ABI headers only if required
@@ -102,6 +103,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/arm32-linux/odp/api/abi/thread.h \
 	odp/arch/arm32-linux/odp/api/abi/thrmask.h \
+	odp/arch/arm32-linux/odp/api/abi/time.h \
 	odp/arch/arm32-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_AARCH64
@@ -125,6 +127,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/arm64-linux/odp/api/abi/thread.h \
 	odp/arch/arm64-linux/odp/api/abi/thrmask.h \
+	odp/arch/arm64-linux/odp/api/abi/time.h \
 	odp/arch/arm64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_MIPS64
@@ -148,6 +151,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/mips64-linux/odp/api/abi/thread.h \
 	odp/arch/mips64-linux/odp/api/abi/thrmask.h \
+	odp/arch/mips64-linux/odp/api/abi/time.h \
 	odp/arch/mips64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_POWERPC
@@ -171,6 +175,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/power64-linux/odp/api/abi/thread.h \
 	odp/arch/power64-linux/odp/api/abi/thrmask.h \
+	odp/arch/power64-linux/odp/api/abi/time.h \
 	odp/arch/power64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_X86_32
@@ -194,6 +199,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/x86_32-linux/odp/api/abi/thread.h \
 	odp/arch/x86_32-linux/odp/api/abi/thrmask.h \
+	odp/arch/x86_32-linux/odp/api/abi/time.h \
 	odp/arch/x86_32-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_X86_64
@@ -217,6 +223,7 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \
 	odp/arch/x86_64-linux/odp/api/abi/thread.h \
 	odp/arch/x86_64-linux/odp/api/abi/thrmask.h \
+	odp/arch/x86_64-linux/odp/api/abi/time.h \
 	odp/arch/x86_64-linux/odp/api/abi/version.h
 endif
 endif # ODP_ABI_COMPAT
diff --git a/include/odp/api/abi-default/time.h b/include/odp/api/abi-default/time.h
new file mode 100644
index 000000000..d3b5abda3
--- /dev/null
+++ b/include/odp/api/abi-default/time.h
@@ -0,0 +1,53 @@
+/* Copyright (c) 2015, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP time service
+ */
+
+#ifndef ODP_ABI_TIME_H_
+#define ODP_ABI_TIME_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup odp_time
+ *  @{
+ **/
+
+/**
+ * @internal Time structure used for both POSIX timespec and HW counter
+ * implementations.
+ */
+typedef struct odp_time_t {
+	/** @internal Variant mappings for time type */
+	union {
+		/** @internal Used with generic 64 bit operations */
+		uint64_t u64;
+
+		/** @internal Nanoseconds */
+		uint64_t nsec;
+
+		/** @internal HW timer counter value */
+		uint64_t count;
+
+	};
+} odp_time_t;
+
+#define ODP_TIME_NULL ((odp_time_t){.u64 = 0})
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..2672d7892
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/time.h>