diff mbox series

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

Message ID 1510333217-26418-4-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 pool 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 +
 .../odp_pool_subsystem.h => include/subsystem/spec/pool_subsystem.h    | 0
 platform/linux-dpdk/Makefile.am                                        | 1 -
 platform/linux-dpdk/include/odp_pool_internal.h                        | 2 +-
 platform/linux-generic/Makefile.am                                     | 1 -
 platform/linux-generic/include/odp_pool_internal.h                     | 2 +-
 platform/linux-generic/pool/subsystem.c                                | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename platform/linux-generic/include/odp_pool_subsystem.h => include/subsystem/spec/pool_subsystem.h (100%)
diff mbox series

Patch

diff --git a/include/Makefile.am b/include/Makefile.am
index ffff3f4df..f794be53f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -76,7 +76,8 @@  frameworksmodularspecinclude_HEADERS = \
 
 subsystemspecincludedir= $(includedir)/subsystem/spec
 subsystemspecinclude_HEADERS = \
-		  subsystem/spec/buffer_subsystem.h
+		  subsystem/spec/buffer_subsystem.h \
+		  subsystem/spec/pool_subsystem.h
 
 odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
 odpapiabidefaultinclude_HEADERS = \
diff --git a/include/odp_mf.h b/include/odp_mf.h
index a4e6474fd..787746817 100644
--- a/include/odp_mf.h
+++ b/include/odp_mf.h
@@ -20,6 +20,7 @@  extern C {
 
 #include <frameworks/modular/spec/module.h>
 #include <subsystem/spec/buffer_subsystem.h>
+#include <subsystem/spec/pool_subsystem.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp_pool_subsystem.h b/include/subsystem/spec/pool_subsystem.h
similarity index 100%
rename from platform/linux-generic/include/odp_pool_subsystem.h
rename to include/subsystem/spec/pool_subsystem.h
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 948518f90..29440714b 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -207,7 +207,6 @@  noinst_HEADERS = \
 		  ${top_srcdir}/platform/linux-generic/include/odp_packet_io_ring_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \
 		  ${srcdir}/include/odp_pool_internal.h \
-		  ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \
 		  ${srcdir}/include/odp_posix_extensions.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \
diff --git a/platform/linux-dpdk/include/odp_pool_internal.h b/platform/linux-dpdk/include/odp_pool_internal.h
index 2b3fc18c0..7d8fba14e 100644
--- a/platform/linux-dpdk/include/odp_pool_internal.h
+++ b/platform/linux-dpdk/include/odp_pool_internal.h
@@ -20,7 +20,7 @@  extern "C" {
 
 #include <odp/api/std_types.h>
 #include <odp/api/pool.h>
-#include <odp_pool_subsystem.h>
+#include <subsystem/spec/pool_subsystem.h>
 #include <odp_buffer_internal.h>
 #include <odp/api/packet_io.h>
 #include <odp/api/align.h>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 60e1fccb4..d3cf48a84 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -188,7 +188,6 @@  noinst_HEADERS = \
 		  include/odp_pkt_queue_internal.h \
 		  include/odp_queue_subsystem.h \
 		  include/odp_pool_internal.h \
-		  include/odp_pool_subsystem.h \
 		  include/odp_posix_extensions.h \
 		  include/odp_queue_internal.h \
 		  include/odp_queue_scalable_internal.h \
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index 5004e283c..adbdc4917 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -21,7 +21,7 @@  extern "C" {
 #include <odp/api/shared_memory.h>
 #include <odp/api/ticketlock.h>
 
-#include <odp_pool_subsystem.h>
+#include <subsystem/spec/pool_subsystem.h>
 #include <odp_buffer_internal.h>
 #include <odp_config_internal.h>
 #include <odp_ring_internal.h>
diff --git a/platform/linux-generic/pool/subsystem.c b/platform/linux-generic/pool/subsystem.c
index 073a9fa98..66c84380d 100644
--- a/platform/linux-generic/pool/subsystem.c
+++ b/platform/linux-generic/pool/subsystem.c
@@ -7,7 +7,7 @@ 
  */
 #include <odp/api/pool.h>
 #include <odp_internal.h>
-#include <odp_pool_subsystem.h>
+#include <subsystem/spec/pool_subsystem.h>
 #include <odp_debug_internal.h>
 
 #define SUBSYSTEM_VERSION 0x00010000UL