diff mbox series

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

Message ID 1510333217-26418-3-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 buffer 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                                                   | 4 ++++
 include/odp_mf.h                                                      | 1 +
 .../subsystem/spec/buffer_subsystem.h                                 | 1 -
 platform/linux-dpdk/Makefile.am                                       | 1 -
 platform/linux-dpdk/buffer/dpdk.c                                     | 2 +-
 platform/linux-generic/Makefile.am                                    | 1 -
 platform/linux-generic/buffer/generic.c                               | 2 +-
 platform/linux-generic/buffer/subsystem.c                             | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)
 rename platform/linux-generic/include/odp_buffer_subsystem.h => include/subsystem/spec/buffer_subsystem.h (99%)
diff mbox series

Patch

diff --git a/include/Makefile.am b/include/Makefile.am
index 1aeec1c72..ffff3f4df 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -74,6 +74,10 @@  frameworksmodularspecinclude_HEADERS = \
 		  frameworks/modular/spec/module.h \
 		  frameworks/modular/spec/list.h
 
+subsystemspecincludedir= $(includedir)/subsystem/spec
+subsystemspecinclude_HEADERS = \
+		  subsystem/spec/buffer_subsystem.h
+
 odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
 odpapiabidefaultinclude_HEADERS = \
 	odp/arch/default/api/abi/buffer.h \
diff --git a/include/odp_mf.h b/include/odp_mf.h
index f29ae6cee..a4e6474fd 100644
--- a/include/odp_mf.h
+++ b/include/odp_mf.h
@@ -19,6 +19,7 @@  extern C {
 #endif
 
 #include <frameworks/modular/spec/module.h>
+#include <subsystem/spec/buffer_subsystem.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/include/subsystem/spec/buffer_subsystem.h
similarity index 99%
rename from platform/linux-generic/include/odp_buffer_subsystem.h
rename to include/subsystem/spec/buffer_subsystem.h
index 35b2a06e1..3817a04a1 100644
--- a/platform/linux-generic/include/odp_buffer_subsystem.h
+++ b/include/subsystem/spec/buffer_subsystem.h
@@ -61,4 +61,3 @@  typedef ODP_MODULE_CLASS(buffer) {
 
 #include <odp/visibility_end.h>
 #endif
-
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index aa7990873..948518f90 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -175,7 +175,6 @@  odpdrvplatinclude_HEADERS = \
 
 
 noinst_HEADERS = \
-		  ${top_srcdir}/platform/linux-generic/include/odp_buffer_subsystem.h \
 		  ${top_srcdir}/platform/linux-generic/include/_fdserver_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/_ishm_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/_ishmphy_internal.h \
diff --git a/platform/linux-dpdk/buffer/dpdk.c b/platform/linux-dpdk/buffer/dpdk.c
index 704468eea..22e1123b0 100644
--- a/platform/linux-dpdk/buffer/dpdk.c
+++ b/platform/linux-dpdk/buffer/dpdk.c
@@ -9,7 +9,7 @@ 
 #include <odp/api/buffer.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_inlines.h>
-#include <odp_buffer_subsystem.h>
+#include <subsystem/spec/buffer_subsystem.h>
 #include <odp_debug_internal.h>
 #include <odp_pool_internal.h>
 
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index afbb0edba..60e1fccb4 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -159,7 +159,6 @@  noinst_HEADERS = \
 		  include/odp_bitmap_internal.h \
 		  include/odp_bitset.h \
 		  include/odp_buffer_internal.h \
-		  include/odp_buffer_subsystem.h \
 		  include/odp_classification_datamodel.h \
 		  include/odp_classification_inlines.h \
 		  include/odp_classification_internal.h \
diff --git a/platform/linux-generic/buffer/generic.c b/platform/linux-generic/buffer/generic.c
index 3281119be..cf99407cc 100644
--- a/platform/linux-generic/buffer/generic.c
+++ b/platform/linux-generic/buffer/generic.c
@@ -11,7 +11,7 @@ 
 #include <odp_buffer_internal.h>
 #include <odp_buffer_inlines.h>
 #include <odp_debug_internal.h>
-#include <odp_buffer_subsystem.h>
+#include <subsystem/spec/buffer_subsystem.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c
index 767113975..883781756 100644
--- a/platform/linux-generic/buffer/subsystem.c
+++ b/platform/linux-generic/buffer/subsystem.c
@@ -6,7 +6,7 @@ 
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <odp/api/buffer.h>
-#include <odp_buffer_subsystem.h>
+#include <subsystem/spec/buffer_subsystem.h>
 #include <odp_debug_internal.h>
 
 ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs",