api: plat: move platform type headers into plat directory

Makes it easier to see what's platform specific types

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan@linaro.org>
Reviewed-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

21 files changed, 32 insertions, 29 deletions

diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h
index 343558f20..158210219 100644
--- a/include/odp/api/pool.h
+++ b/include/odp/api/pool.h
@@ -21,7 +21,7 @@ extern "C" {
 
 
 #include <odp/std_types.h>
-#include <odp/shared_memory_types.h>
+#include <odp/plat/shared_memory_types.h>
 #include <odp/buffer.h>
 #include <odp/event.h>
 
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 3fdb1305e..79b37435f 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -12,18 +12,13 @@ odpincludedir= $(includedir)/odp
 odpinclude_HEADERS = \
 		  $(top_srcdir)/platform/linux-generic/include/odp/align.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/atomic.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/atomic_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/barrier.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/buffer.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/buffer_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/byteorder.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/byteorder_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/classification.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/classification_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/compiler.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/config.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/cpumask.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/cpumask_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/crypto.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/debug.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/event.h \
@@ -32,16 +27,12 @@ odpinclude_HEADERS = \
 		  $(top_srcdir)/platform/linux-generic/include/odp/packet_flags.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/packet.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/packet_io.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/packet_io_types.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/packet_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/platform_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/pool.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/pool_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/queue.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/rwlock.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/schedule.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/shared_memory.h \
-		  $(top_srcdir)/platform/linux-generic/include/odp/shared_memory_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/spinlock.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/std_types.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/sync.h \
@@ -52,6 +43,18 @@ odpinclude_HEADERS = \
 		  $(top_srcdir)/platform/linux-generic/include/odp/timer.h \
 		  $(top_srcdir)/platform/linux-generic/include/odp/version.h
 
+odpplatincludedir= $(includedir)/odp/plat
+odpplatinclude_HEADERS = \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/atomic_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/buffer_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/byteorder_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/classification_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/cpumask_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/packet_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/packet_io_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/pool_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp/plat/shared_memory_types.h
+
 odpapiincludedir= $(includedir)/odp/api
 odpapiinclude_HEADERS = \
 		  $(top_srcdir)/include/odp/api/align.h \
diff --git a/platform/linux-generic/include/odp/atomic.h b/platform/linux-generic/include/odp/atomic.h
index 952b0f4a0..e47a280bf 100644
--- a/platform/linux-generic/include/odp/atomic.h
+++ b/platform/linux-generic/include/odp/atomic.h
@@ -19,7 +19,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <odp/align.h>
-#include <odp/atomic_types.h>
+#include <odp/plat/atomic_types.h>
 
 /** @ingroup odp_synchronizers
  *  @{
diff --git a/platform/linux-generic/include/odp/barrier.h b/platform/linux-generic/include/odp/barrier.h
index 382acd516..bce373471 100644
--- a/platform/linux-generic/include/odp/barrier.h
+++ b/platform/linux-generic/include/odp/barrier.h
@@ -26,7 +26,7 @@ extern "C" {
  */
 
 #include <odp/api/barrier.h>
-#include <odp/shared_memory_types.h>
+#include <odp/plat/shared_memory_types.h>
 #include <odp/api/pool.h>
 
 #ifdef __cplusplus
diff --git a/platform/linux-generic/include/odp/buffer.h b/platform/linux-generic/include/odp/buffer.h
index 9c11300ca..dd255ecaa 100644
--- a/platform/linux-generic/include/odp/buffer.h
+++ b/platform/linux-generic/include/odp/buffer.h
@@ -18,8 +18,8 @@ extern "C" {
 #endif
 
 #include <odp/std_types.h>
-#include <odp/pool_types.h>
-#include <odp/buffer_types.h>
+#include <odp/plat/buffer_types.h>
+#include <odp/plat/pool_types.h>
 
 /** @ingroup odp_buffer
  *  @{
diff --git a/platform/linux-generic/include/odp/byteorder.h b/platform/linux-generic/include/odp/byteorder.h
index a44b6ece5..173b0475d 100644
--- a/platform/linux-generic/include/odp/byteorder.h
+++ b/platform/linux-generic/include/odp/byteorder.h
@@ -19,7 +19,7 @@ extern "C" {
 
 #include <endian.h>
 #include <asm/byteorder.h>
-#include <odp/byteorder_types.h>
+#include <odp/plat/byteorder_types.h>
 #include <odp/std_types.h>
 #include <odp/compiler.h>
 
diff --git a/platform/linux-generic/include/odp/classification.h b/platform/linux-generic/include/odp/classification.h
index 57255536c..335523c00 100644
--- a/platform/linux-generic/include/odp/classification.h
+++ b/platform/linux-generic/include/odp/classification.h
@@ -18,10 +18,10 @@ extern "C" {
 #endif
 
 #include <odp/std_types.h>
-#include <odp/pool_types.h>
-#include <odp/classification_types.h>
-#include <odp/packet_types.h>
-#include <odp/packet_io_types.h>
+#include <odp/plat/pool_types.h>
+#include <odp/plat/classification_types.h>
+#include <odp/plat/packet_types.h>
+#include <odp/plat/packet_io_types.h>
 
 /** @ingroup odp_classification
  *  @{
diff --git a/platform/linux-generic/include/odp/cpumask.h b/platform/linux-generic/include/odp/cpumask.h
index a219a66f5..f09bb91d4 100644
--- a/platform/linux-generic/include/odp/cpumask.h
+++ b/platform/linux-generic/include/odp/cpumask.h
@@ -21,7 +21,7 @@ extern "C" {
 #include <sched.h>
 
 #include <odp/std_types.h>
-#include <odp/cpumask_types.h>
+#include <odp/plat/cpumask_types.h>
 
 /** @ingroup odp_scheduler
  *  @{
diff --git a/platform/linux-generic/include/odp/packet.h b/platform/linux-generic/include/odp/packet.h
index 2120c68af..6a41f3f5c 100644
--- a/platform/linux-generic/include/odp/packet.h
+++ b/platform/linux-generic/include/odp/packet.h
@@ -18,8 +18,8 @@ extern "C" {
 #endif
 
 #include <odp/std_types.h>
-#include <odp/packet_io_types.h>
-#include <odp/packet_types.h>
+#include <odp/plat/packet_io_types.h>
+#include <odp/plat/packet_types.h>
 
 /** @ingroup odp_packet
  *  @{
diff --git a/platform/linux-generic/include/odp/packet_io.h b/platform/linux-generic/include/odp/packet_io.h
index 01bd777d9..134cd7882 100644
--- a/platform/linux-generic/include/odp/packet_io.h
+++ b/platform/linux-generic/include/odp/packet_io.h
@@ -18,10 +18,10 @@ extern "C" {
 #endif
 
 #include <odp/std_types.h>
-#include <odp/pool_types.h>
-#include <odp/classification_types.h>
-#include <odp/packet_types.h>
-#include <odp/packet_io_types.h>
+#include <odp/plat/pool_types.h>
+#include <odp/plat/classification_types.h>
+#include <odp/plat/packet_types.h>
+#include <odp/plat/packet_io_types.h>
 
 /** @ingroup odp_packet_io
  *  @{
diff --git a/platform/linux-generic/include/odp/atomic_types.h b/platform/linux-generic/include/odp/plat/atomic_types.h
index 3cdcab8bd..3cdcab8bd 100644
--- a/platform/linux-generic/include/odp/atomic_types.h
+++ b/platform/linux-generic/include/odp/plat/atomic_types.h
diff --git a/platform/linux-generic/include/odp/buffer_types.h b/platform/linux-generic/include/odp/plat/buffer_types.h
index f5cce1550..f5cce1550 100644
--- a/platform/linux-generic/include/odp/buffer_types.h
+++ b/platform/linux-generic/include/odp/plat/buffer_types.h
diff --git a/platform/linux-generic/include/odp/byteorder_types.h b/platform/linux-generic/include/odp/plat/byteorder_types.h
index cf917b1a2..cf917b1a2 100644
--- a/platform/linux-generic/include/odp/byteorder_types.h
+++ b/platform/linux-generic/include/odp/plat/byteorder_types.h
diff --git a/platform/linux-generic/include/odp/classification_types.h b/platform/linux-generic/include/odp/plat/classification_types.h
index 07d640e62..07d640e62 100644
--- a/platform/linux-generic/include/odp/classification_types.h
+++ b/platform/linux-generic/include/odp/plat/classification_types.h
diff --git a/platform/linux-generic/include/odp/cpumask_types.h b/platform/linux-generic/include/odp/plat/cpumask_types.h
index 6d9e12995..6d9e12995 100644
--- a/platform/linux-generic/include/odp/cpumask_types.h
+++ b/platform/linux-generic/include/odp/plat/cpumask_types.h
diff --git a/platform/linux-generic/include/odp/packet_io_types.h b/platform/linux-generic/include/odp/plat/packet_io_types.h
index a6bbacffa..a6bbacffa 100644
--- a/platform/linux-generic/include/odp/packet_io_types.h
+++ b/platform/linux-generic/include/odp/plat/packet_io_types.h
diff --git a/platform/linux-generic/include/odp/packet_types.h b/platform/linux-generic/include/odp/plat/packet_types.h
index 80c0c28ad..60d64439c 100644
--- a/platform/linux-generic/include/odp/packet_types.h
+++ b/platform/linux-generic/include/odp/plat/packet_types.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 
-#include <odp/buffer_types.h>
+#include <odp/plat/buffer_types.h>
 
 /** @addtogroup odp_packet ODP PACKET
  *  Operations on a packet.
diff --git a/platform/linux-generic/include/odp/pool_types.h b/platform/linux-generic/include/odp/plat/pool_types.h
index 7bfbbfc0a..7bfbbfc0a 100644
--- a/platform/linux-generic/include/odp/pool_types.h
+++ b/platform/linux-generic/include/odp/plat/pool_types.h
diff --git a/platform/linux-generic/include/odp/shared_memory_types.h b/platform/linux-generic/include/odp/plat/shared_memory_types.h
index c044cb935..c044cb935 100644
--- a/platform/linux-generic/include/odp/shared_memory_types.h
+++ b/platform/linux-generic/include/odp/plat/shared_memory_types.h
diff --git a/platform/linux-generic/include/odp/platform_types.h b/platform/linux-generic/include/odp/platform_types.h
index 2313aed48..a77ee7cf2 100644
--- a/platform/linux-generic/include/odp/platform_types.h
+++ b/platform/linux-generic/include/odp/platform_types.h
@@ -19,7 +19,7 @@
 #define ODP_IMPL_TYPES_H_
 
 #include <odp/std_types.h>
-#include <odp/buffer_types.h>
+#include <odp/plat/buffer_types.h>
 
 /** @defgroup odp_platform_types ODP PLATFORM TYPES
  *  Implementation specific definitions for ODP abstract types.
diff --git a/platform/linux-generic/include/odp/shared_memory.h b/platform/linux-generic/include/odp/shared_memory.h
index fb81eadd9..5b1ded8ae 100644
--- a/platform/linux-generic/include/odp/shared_memory.h
+++ b/platform/linux-generic/include/odp/shared_memory.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #include <odp/std_types.h>
-#include <odp/shared_memory_types.h>
+#include <odp/plat/shared_memory_types.h>
 
 /** @ingroup odp_shared_memory
  *  @{