diff mbox series

[2.0,v1,6/6] linux-gen: modular-framework: make public pktio_ops subsystem header

Message ID 1509019205-3327-7-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [2.0,v1,1/6] linux-gen: modular-framework: make public modular framework headers | expand

Commit Message

Github ODP bot Oct. 26, 2017, noon UTC 
From: Bogdan Pricope <bogdan.pricope@linaro.org>


Make public pktio_ops subsystem header.

Signed-off-by: Bogdan Pricope <bogdan.pricope@linaro.org>

---
/** Email created from pull request 261 (bogdanPricope:2_0_mf_include_pr)
 ** https://github.com/Linaro/odp/pull/261
 ** Patch: https://github.com/Linaro/odp/pull/261.patch
 ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f
 ** Merge commit sha: 4a263f664ff0e7916e1fe52f09afeed0db9a11dc
 **/
 .../odp/subsystem/spec/pktio_ops_subsystem.h                           | 0
 include/odp_mf.h                                                       | 1 +
 platform/Makefile.inc                                                  | 3 ++-
 platform/linux-dpdk/Makefile.am                                        | 1 -
 platform/linux-dpdk/include/odp_packet_io_internal.h                   | 2 +-
 platform/linux-generic/Makefile.am                                     | 1 -
 platform/linux-generic/include/odp_packet_io_internal.h                | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename platform/linux-generic/include/odp_pktio_ops_subsystem.h => include/odp/subsystem/spec/pktio_ops_subsystem.h (100%)
diff mbox series

Patch

diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/include/odp/subsystem/spec/pktio_ops_subsystem.h
similarity index 100%
rename from platform/linux-generic/include/odp_pktio_ops_subsystem.h
rename to include/odp/subsystem/spec/pktio_ops_subsystem.h
diff --git a/include/odp_mf.h b/include/odp_mf.h
index a03040c23..cd293a80f 100644
--- a/include/odp_mf.h
+++ b/include/odp_mf.h
@@ -23,6 +23,7 @@  extern C {
 #include <odp/subsystem/spec/pool_subsystem.h>
 #include <odp/subsystem/spec/queue_subsystem.h>
 #include <odp/subsystem/spec/schedule_subsystem.h>
+#include <odp/subsystem/spec/pktio_ops_subsystem.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index da1fb52e3..696f92cf2 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -87,7 +87,8 @@  odpsubsystemspecinclude_HEADERS = \
 		  $(top_srcdir)/include/odp/subsystem/spec/buffer_subsystem.h \
 		  $(top_srcdir)/include/odp/subsystem/spec/pool_subsystem.h \
 		  $(top_srcdir)/include/odp/subsystem/spec/queue_subsystem.h \
-		  $(top_srcdir)/include/odp/subsystem/spec/schedule_subsystem.h
+		  $(top_srcdir)/include/odp/subsystem/spec/schedule_subsystem.h \
+		  $(top_srcdir)/include/odp/subsystem/spec/pktio_ops_subsystem.h
 
 odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
 odpapiabidefaultinclude_HEADERS = \
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 96915e818..63dd99250 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -194,7 +194,6 @@  noinst_HEADERS = \
 		  ${srcdir}/pktio/dpdk.h \
 		  ${srcdir}/include/odp_packet_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_ipc.h \
-		  ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_subsystem.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_socket.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_pktio_ops_loopback.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_name_table_internal.h \
diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h
index 089ad38c5..fb4df032c 100644
--- a/platform/linux-dpdk/include/odp_packet_io_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_io_internal.h
@@ -32,7 +32,7 @@  extern "C" {
 
 /* Forward declaration */
 typedef union pktio_entry_u pktio_entry_t;
-#include <odp_pktio_ops_subsystem.h>
+#include <odp/subsystem/spec/pktio_ops_subsystem.h>
 
 #define PKTIO_NAME_LEN 256
 
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 027e54fd8..d73b6bf10 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -183,7 +183,6 @@  noinst_HEADERS = \
 		  ${srcdir}/include/odp_pktio_ops_pcap.h \
 		  ${srcdir}/include/odp_pktio_ops_socket.h \
 		  ${srcdir}/include/odp_pktio_ops_tap.h \
-		  ${srcdir}/include/odp_pktio_ops_subsystem.h \
 		  ${srcdir}/include/odp_pkt_queue_internal.h \
 		  ${srcdir}/include/odp_pool_internal.h \
 		  ${srcdir}/include/odp_posix_extensions.h \
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index b26a35d25..8559bedeb 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -35,7 +35,7 @@  extern "C" {
 #define PKTIO_MAX_QUEUES 64
 /* Forward declaration */
 typedef union pktio_entry_u pktio_entry_t;
-#include <odp_pktio_ops_subsystem.h>
+#include <odp/subsystem/spec/pktio_ops_subsystem.h>
 
 #define PKTIO_NAME_LEN 256