diff mbox series

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

Message ID 1509019205-3327-3-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 buffer 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/buffer_subsystem.h                             | 1 -
 include/odp_mf.h                                                      | 1 +
 platform/Makefile.inc                                                 | 4 ++++
 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/odp/subsystem/spec/buffer_subsystem.h (99%)
diff mbox series

Patch

diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/include/odp/subsystem/spec/buffer_subsystem.h
similarity index 99%
rename from platform/linux-generic/include/odp_buffer_subsystem.h
rename to include/odp/subsystem/spec/buffer_subsystem.h
index b8f6a6953..011ad448c 100644
--- a/platform/linux-generic/include/odp_buffer_subsystem.h
+++ b/include/odp/subsystem/spec/buffer_subsystem.h
@@ -61,4 +61,3 @@  typedef ODP_MODULE_CLASS(buffer) {
 
 #include <odp/visibility_end.h>
 #endif
-
diff --git a/include/odp_mf.h b/include/odp_mf.h
index f8998f280..747c6dc4d 100644
--- a/include/odp_mf.h
+++ b/include/odp_mf.h
@@ -19,6 +19,7 @@  extern C {
 #endif
 
 #include <odp/mf/spec/module.h>
+#include <odp/subsystem/spec/buffer_subsystem.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index e6270f6cd..0d38d377e 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -82,6 +82,10 @@  odpmfspecinclude_HEADERS = \
 		  $(top_srcdir)/include/odp/mf/spec/module.h \
 		  $(top_srcdir)/include/odp/mf/spec/list.h
 
+odpsubsystemspecincludedir= $(includedir)/odp/subsytem/spec
+odpsubsystemspecinclude_HEADERS = \
+		  $(top_srcdir)/include/odp/subsystem/spec/buffer_subsystem.h
+
 odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
 odpapiabidefaultinclude_HEADERS = \
 	$(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 14bd1b866..e1074cc23 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -172,7 +172,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..65bb6b03c 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 <odp/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 e5a776a25..4acd9236f 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -160,7 +160,6 @@  noinst_HEADERS = \
 		  ${srcdir}/include/odp_bitmap_internal.h \
 		  ${srcdir}/include/odp_bitset.h \
 		  ${srcdir}/include/odp_buffer_internal.h \
-		  ${srcdir}/include/odp_buffer_subsystem.h \
 		  ${srcdir}/include/odp_classification_datamodel.h \
 		  ${srcdir}/include/odp_classification_inlines.h \
 		  ${srcdir}/include/odp_classification_internal.h \
diff --git a/platform/linux-generic/buffer/generic.c b/platform/linux-generic/buffer/generic.c
index 3281119be..70b1a73d7 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 <odp/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..2e1bf59a3 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 <odp/subsystem/spec/buffer_subsystem.h>
 #include <odp_debug_internal.h>
 
 ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs",