From: Bogdan Pricope <bogdan.pric...@linaro.org> Move queue subsystem header to a public folder.
Signed-off-by: Bogdan Pricope <bogdan.pric...@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_queue_subsystem.h => include/subsystem/spec/queue_subsystem.h | 0 platform/linux-dpdk/Makefile.am | 1 - platform/linux-generic/Makefile.am | 1 - platform/linux-generic/queue/generic.c | 2 +- platform/linux-generic/queue/scalable.c | 2 +- platform/linux-generic/queue/subsystem.c | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename platform/linux-generic/include/odp_queue_subsystem.h => include/subsystem/spec/queue_subsystem.h (100%) diff --git a/include/Makefile.am b/include/Makefile.am index f794be53f..3ced809b0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -77,7 +77,8 @@ frameworksmodularspecinclude_HEADERS = \ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ - subsystem/spec/pool_subsystem.h + subsystem/spec/pool_subsystem.h \ + subsystem/spec/queue_subsystem.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/include/odp_mf.h b/include/odp_mf.h index 787746817..29caec22b 100644 --- a/include/odp_mf.h +++ b/include/odp_mf.h @@ -21,6 +21,7 @@ extern C { #include <frameworks/modular/spec/module.h> #include <subsystem/spec/buffer_subsystem.h> #include <subsystem/spec/pool_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/include/subsystem/spec/queue_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_queue_subsystem.h rename to include/subsystem/spec/queue_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 29440714b..fd427c7f6 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -210,7 +210,6 @@ noinst_HEADERS = \ ${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 \ - ${top_srcdir}/platform/linux-generic/include/odp_queue_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index d3cf48a84..002370f7e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -186,7 +186,6 @@ noinst_HEADERS = \ include/odp_pktio_ops_tap.h \ include/odp_pktio_ops_subsystem.h \ include/odp_pkt_queue_internal.h \ - include/odp_queue_subsystem.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ include/odp_queue_internal.h \ diff --git a/platform/linux-generic/queue/generic.c b/platform/linux-generic/queue/generic.c index ab2b97048..37c02380f 100644 --- a/platform/linux-generic/queue/generic.c +++ b/platform/linux-generic/queue/generic.c @@ -9,7 +9,7 @@ #include <odp/api/queue.h> #include <odp_queue_internal.h> #include <odp_queue_if.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp/api/std_types.h> #include <odp/api/align.h> #include <odp/api/buffer.h> diff --git a/platform/linux-generic/queue/scalable.c b/platform/linux-generic/queue/scalable.c index 00cd8da65..f4f5efb85 100644 --- a/platform/linux-generic/queue/scalable.c +++ b/platform/linux-generic/queue/scalable.c @@ -23,7 +23,7 @@ #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp_schedule_if.h> #include <_ishm_internal.h> #include <_ishmpool_internal.h> diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c index 05e8edb8e..ddf6b52d8 100644 --- a/platform/linux-generic/queue/subsystem.c +++ b/platform/linux-generic/queue/subsystem.c @@ -11,7 +11,7 @@ #include <odp/api/queue.h> #include <odp_internal.h> #include <odp_debug_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION);