diff mbox series

[2.0,v2,6/6] linux-gen: modular-framework: move pktio_ops subsystem header to a public folder

Message ID 1510333217-26418-7-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [2.0,v2,1/6] linux-gen: modular-framework: move modular framework headers to a public folder | expand

Commit Message

Github ODP bot Nov. 10, 2017, 5 p.m. UTC 
From: Bogdan Pricope <bogdan.pricope@linaro.org>


Move pktio_ops subsystem header to a public folder.

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: 65419c16086369f86dea068e54ce492526fa4f41
 ** Merge commit sha: 3034b865079536d2064a7ceb890b5bf6876949a6
 **/
 include/Makefile.am                                                    | 3 ++-
 include/odp_mf.h                                                       | 1 +
 .../subsystem/spec/pktio_ops_subsystem.h                               | 0
 platform/linux-dpdk/Makefile.am                                        | 1 -
 platform/linux-generic/Makefile.am                                     | 1 -
 platform/linux-generic/include/odp_packet_io_internal.h                | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename platform/linux-generic/include/odp_pktio_ops_subsystem.h => include/subsystem/spec/pktio_ops_subsystem.h (100%)
diff mbox series

Patch

diff --git a/include/Makefile.am b/include/Makefile.am
index 095456ff7..3a784619e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -79,7 +79,8 @@  subsystemspecinclude_HEADERS = \
 		  subsystem/spec/buffer_subsystem.h \
 		  subsystem/spec/pool_subsystem.h \
 		  subsystem/spec/queue_subsystem.h \
-		  subsystem/spec/schedule_subsystem.h
+		  subsystem/spec/schedule_subsystem.h \
+		  subsystem/spec/pktio_ops_subsystem.h
 
 odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
 odpapiabidefaultinclude_HEADERS = \
diff --git a/include/odp_mf.h b/include/odp_mf.h
index de3a06a23..31ced6fb4 100644
--- a/include/odp_mf.h
+++ b/include/odp_mf.h
@@ -23,6 +23,7 @@  extern C {
 #include <subsystem/spec/pool_subsystem.h>
 #include <subsystem/spec/queue_subsystem.h>
 #include <subsystem/spec/schedule_subsystem.h>
+#include <subsystem/spec/pktio_ops_subsystem.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/include/subsystem/spec/pktio_ops_subsystem.h
similarity index 100%
rename from platform/linux-generic/include/odp_pktio_ops_subsystem.h
rename to include/subsystem/spec/pktio_ops_subsystem.h
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 703592b1a..6d3a16a59 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -198,7 +198,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-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 303a34882..b1349056d 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -184,7 +184,6 @@  noinst_HEADERS = \
 		  include/odp_pktio_ops_pcap.h \
 		  include/odp_pktio_ops_socket.h \
 		  include/odp_pktio_ops_tap.h \
-		  include/odp_pktio_ops_subsystem.h \
 		  include/odp_pkt_queue_internal.h \
 		  include/odp_pool_internal.h \
 		  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 7df11618e..397a5cb61 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -34,7 +34,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 <subsystem/spec/pktio_ops_subsystem.h>
 
 #define PKTIO_NAME_LEN 256