linux-dpdk: configure: move inline files to plat subdirectory

To facilitate integration with odp-linux, move the conditional inline
files associated with ABI support from include/odp/api to
include/odp/api/plat since these are platform-specific optimizations.
Note that this also moves the .gitignore into the platform/linux-dpdk
directory to avoid conflicts with other platforms sharing the main
.gitignore file.

Suggested by: Zoltan Kiss <zoltan.kiss@schaman.hu>

Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-and-tested-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>

11 files changed, 13 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index bcc556c9a..d4e7d02ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,5 @@ ltmain.sh
 m4/*.m4
 missing
 pkgconfig/libodp*.pc
-platform/linux-dpdk/include/odp/api/inlines.h
 tags
 test-driver
diff --git a/platform/linux-dpdk/.gitignore b/platform/linux-dpdk/.gitignore
new file mode 100644
index 000000000..654e50caa
--- /dev/null
+++ b/platform/linux-dpdk/.gitignore
@@ -0,0 +1 @@
+include/odp/api/plat/inlines.h
\ No newline at end of file
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index d4e9c79eb..4d87345fc 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -47,11 +47,8 @@ odpapiinclude_HEADERS = \
 		  $(srcdir)/include/odp/api/hash.h \
 		  $(srcdir)/include/odp/api/hints.h \
 		  $(srcdir)/include/odp/api/init.h \
-		  $(builddir)/include/odp/api/inlines.h \
 		  $(srcdir)/include/odp/api/packet_flags.h \
-		  $(srcdir)/include/odp/api/packet_flags_inlines.h \
 		  $(srcdir)/include/odp/api/packet.h \
-		  $(srcdir)/include/odp/api/packet_inlines.h \
 		  $(srcdir)/include/odp/api/packet_io.h \
 		  $(srcdir)/include/odp/api/packet_io_stats.h \
 		  $(srcdir)/include/odp/api/pool.h \
@@ -90,8 +87,10 @@ odpapiplatinclude_HEADERS = \
 		  $(srcdir)/include/odp/api/plat/crypto_types.h \
 		  $(srcdir)/include/odp/api/plat/event_types.h \
 		  $(srcdir)/include/odp/api/plat/init_types.h \
-		  $(srcdir)/include/odp/api/plat/packet_types.h \
+		  $(srcdir)/include/odp/api/plat/packet_flags_inlines.h \
+		  $(srcdir)/include/odp/api/plat/packet_inlines.h \
 		  $(srcdir)/include/odp/api/plat/packet_io_types.h \
+		  $(srcdir)/include/odp/api/plat/packet_types.h \
 		  $(srcdir)/include/odp/api/plat/pool_types.h \
 		  $(srcdir)/include/odp/api/plat/queue_types.h \
 		  $(srcdir)/include/odp/api/plat/rwlock_types.h \
diff --git a/platform/linux-dpdk/include/odp/api/packet.h b/platform/linux-dpdk/include/odp/api/packet.h
index 61543fa01..f9123d839 100644
--- a/platform/linux-dpdk/include/odp/api/packet.h
+++ b/platform/linux-dpdk/include/odp/api/packet.h
@@ -28,9 +28,9 @@ extern "C" {
  *  @{
  */
 
-#include <odp/api/inlines.h>
+#include <odp/api/plat/inlines.h>
 #ifdef _ODP_INLINES
-#include <odp/api/packet_inlines.h>
+#include <odp/api/plat/packet_inlines.h>
 #endif
 
 /**
diff --git a/platform/linux-dpdk/include/odp/api/packet_flags.h b/platform/linux-dpdk/include/odp/api/packet_flags.h
index 00dd845a2..b6ae9f837 100644
--- a/platform/linux-dpdk/include/odp/api/packet_flags.h
+++ b/platform/linux-dpdk/include/odp/api/packet_flags.h
@@ -28,9 +28,9 @@ extern "C" {
  *  @{
  */
 
-#include <odp/api/inlines.h>
+#include <odp/api/plat/inlines.h>
 #ifdef _ODP_INLINES
-#include <odp/api/packet_flags_inlines.h>
+#include <odp/api/plat/packet_flags_inlines.h>
 #endif
 
 /**
diff --git a/platform/linux-dpdk/include/odp/api/inlines.h.in b/platform/linux-dpdk/include/odp/api/plat/inlines.h.in
index 43e542b51..43e542b51 100644
--- a/platform/linux-dpdk/include/odp/api/inlines.h.in
+++ b/platform/linux-dpdk/include/odp/api/plat/inlines.h.in
diff --git a/platform/linux-dpdk/include/odp/api/packet_flags_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_flags_inlines.h
index 7d2464e81..7d2464e81 100644
--- a/platform/linux-dpdk/include/odp/api/packet_flags_inlines.h
+++ b/platform/linux-dpdk/include/odp/api/plat/packet_flags_inlines.h
diff --git a/platform/linux-dpdk/include/odp/api/packet_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h
index 444919db3..cd403bfab 100644
--- a/platform/linux-dpdk/include/odp/api/packet_inlines.h
+++ b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h
@@ -60,7 +60,8 @@ _STATIC uint32_t odp_packet_user_area_size(odp_packet_t pkt)
 _STATIC void *odp_packet_data(odp_packet_t pkt)
 {
 	char **buf_addr = (char **)(void *)((char *)pkt + buf_addr_offset);
-	uint16_t data_off = *(uint16_t *)(void *)((char *)pkt + data_off_offset);
+	uint16_t data_off =
+		*(uint16_t *)(void *)((char *)pkt + data_off_offset);
 
 	return (void *)(*buf_addr + data_off);
 }
diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4
index 730b6e8fc..6807de4a2 100644
--- a/platform/linux-dpdk/m4/configure.m4
+++ b/platform/linux-dpdk/m4/configure.m4
@@ -75,5 +75,5 @@ LDFLAGS=$OLD_LDFLAGS
 CPPFLAGS=$OLD_CPPFLAGS
 
 AC_CONFIG_FILES([platform/linux-dpdk/Makefile
-		 platform/linux-dpdk/include/odp/api/inlines.h])
+		 platform/linux-dpdk/include/odp/api/plat/inlines.h])
 
diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c
index b536281a1..8bd7379e4 100644
--- a/platform/linux-dpdk/odp_packet.c
+++ b/platform/linux-dpdk/odp_packet.c
@@ -62,7 +62,7 @@ ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t),
 		  "ol_flags should be uint64_t");
 
 #ifndef _ODP_INLINES
-#include <odp/api/packet_inlines.h>
+#include <odp/api/plat/packet_inlines.h>
 #endif
 
 /*
diff --git a/platform/linux-dpdk/odp_packet_flags.c b/platform/linux-dpdk/odp_packet_flags.c
index 1c3b5036b..10d4097cd 100644
--- a/platform/linux-dpdk/odp_packet_flags.c
+++ b/platform/linux-dpdk/odp_packet_flags.c
@@ -8,7 +8,7 @@
 #include <odp_packet_internal.h>
 
 #ifndef _ODP_INLINES
-#include <odp/api/packet_flags_inlines.h>
+#include <odp/api/plat/packet_flags_inlines.h>
 #endif
 
 #define retflag(pkt, x) do {                             \