From: Bogdan Pricope <bogdan.pric...@linaro.org> Move schedule 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 + .../subsystem/spec/schedule_subsystem.h | 0 platform/linux-dpdk/Makefile.am | 1 - platform/linux-generic/Makefile.am | 1 - platform/linux-generic/schedule/generic.c | 2 +- platform/linux-generic/schedule/iquery.c | 2 +- platform/linux-generic/schedule/scalable.c | 2 +- platform/linux-generic/schedule/sp.c | 2 +- platform/linux-generic/schedule/subsystem.c | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename platform/linux-generic/include/odp_schedule_subsystem.h => include/subsystem/spec/schedule_subsystem.h (100%) diff --git a/include/Makefile.am b/include/Makefile.am index 3ced809b0..095456ff7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -78,7 +78,8 @@ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ subsystem/spec/pool_subsystem.h \ - subsystem/spec/queue_subsystem.h + subsystem/spec/queue_subsystem.h \ + subsystem/spec/schedule_subsystem.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/include/odp_mf.h b/include/odp_mf.h index 29caec22b..de3a06a23 100644 --- a/include/odp_mf.h +++ b/include/odp_mf.h @@ -22,6 +22,7 @@ extern C { #include <subsystem/spec/buffer_subsystem.h> #include <subsystem/spec/pool_subsystem.h> #include <subsystem/spec/queue_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_schedule_subsystem.h b/include/subsystem/spec/schedule_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_schedule_subsystem.h rename to include/subsystem/spec/schedule_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index fd427c7f6..703592b1a 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -212,7 +212,6 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.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 \ ${top_srcdir}/platform/linux-generic/include/odp_sorted_list_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_shm_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_time_internal.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 002370f7e..303a34882 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -196,7 +196,6 @@ noinst_HEADERS = \ include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ include/odp_schedule_scalable_ordered.h \ - include/odp_schedule_subsystem.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ include/odp_time_internal.h \ diff --git a/platform/linux-generic/schedule/generic.c b/platform/linux-generic/schedule/generic.c index 73fef40cb..e22762856 100644 --- a/platform/linux-generic/schedule/generic.c +++ b/platform/linux-generic/schedule/generic.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> /* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/iquery.c b/platform/linux-generic/schedule/iquery.c index 5de229832..76d96ff59 100644 --- a/platform/linux-generic/schedule/iquery.c +++ b/platform/linux-generic/schedule/iquery.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_config_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> /* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/scalable.c b/platform/linux-generic/schedule/scalable.c index d8f538202..de9c65285 100644 --- a/platform/linux-generic/schedule/scalable.c +++ b/platform/linux-generic/schedule/scalable.c @@ -29,7 +29,7 @@ #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_bitset.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/schedule/sp.c b/platform/linux-generic/schedule/sp.c index ea7b83422..06e2a1441 100644 --- a/platform/linux-generic/schedule/sp.c +++ b/platform/linux-generic/schedule/sp.c @@ -18,7 +18,7 @@ #include <odp_config_internal.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> #include <odp_queue_internal.h> diff --git a/platform/linux-generic/schedule/subsystem.c b/platform/linux-generic/schedule/subsystem.c index 99c6141c2..edbc93eca 100644 --- a/platform/linux-generic/schedule/subsystem.c +++ b/platform/linux-generic/schedule/subsystem.c @@ -14,7 +14,7 @@ /* Internal header files */ #include <odp_debug_internal.h> #include <odp_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> ODP_SUBSYSTEM_DEFINE(schedule, "schedule public APIs", SCHEDULE_SUBSYSTEM_VERSION);