The fslmc bus interface is for drivers only. Mark as internal and move the header on the driver headers list.
Signed-off-by: David Marchand <david.march...@redhat.com> --- drivers/bus/fslmc/{rte_fslmc.h => bus_fslmc_driver.h} | 7 ++++--- drivers/bus/fslmc/fslmc_bus.c | 1 - drivers/bus/fslmc/fslmc_vfio.c | 1 - drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 1 - drivers/bus/fslmc/private.h | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.h | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/dpaa2/dpaa2_recycle.c | 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 2 +- 20 files changed, 20 insertions(+), 22 deletions(-) rename drivers/bus/fslmc/{rte_fslmc.h => bus_fslmc_driver.h} (98%) diff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/bus_fslmc_driver.h similarity index 98% rename from drivers/bus/fslmc/rte_fslmc.h rename to drivers/bus/fslmc/bus_fslmc_driver.h index 6bdee86aaf..798ddebf3a 100644 --- a/drivers/bus/fslmc/rte_fslmc.h +++ b/drivers/bus/fslmc/bus_fslmc_driver.h @@ -4,8 +4,8 @@ * */ -#ifndef _RTE_FSLMC_H_ -#define _RTE_FSLMC_H_ +#ifndef BUS_FSLMC_DRIVER_H +#define BUS_FSLMC_DRIVER_H /** * @file @@ -26,6 +26,7 @@ extern "C" { #include <inttypes.h> #include <linux/vfio.h> +#include <rte_compat.h> #include <rte_debug.h> #include <rte_interrupts.h> #include <rte_dev.h> @@ -209,4 +210,4 @@ RTE_PMD_EXPORT_NAME(nm, __COUNTER__) } #endif -#endif /* _RTE_FSLMC_H_ */ +#endif /* BUS_FSLMC_DRIVER_H */ diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 0b52c8e46c..8503004e3d 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -17,7 +17,6 @@ #include <rte_mbuf_dyn.h> #include "private.h" -#include <rte_fslmc.h> #include <fslmc_vfio.h> #include "fslmc_logs.h" diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index b172c84d52..8604e43947 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -32,7 +32,6 @@ #include <rte_eal_memconfig.h> #include "private.h" -#include "rte_fslmc.h" #include "fslmc_vfio.h" #include "fslmc_logs.h" #include <mc/fsl_dpmng.h> diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c index 122aa1740d..cfe4280f87 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c @@ -23,7 +23,7 @@ #include <rte_mbuf_pool_ops.h> #include <fslmc_logs.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <mc/fsl_dpbp.h> #include "portal/dpaa2_hw_pvt.h" #include "portal/dpaa2_hw_dpio.h" diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c index 8ed969c7c0..b7d81b518c 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c @@ -21,7 +21,7 @@ #include <ethdev_driver.h> #include <fslmc_logs.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <mc/fsl_dpci.h> #include "portal/dpaa2_hw_pvt.h" #include "portal/dpaa2_hw_dpio.h" diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index 22c51c1a82..071b0d297d 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -33,7 +33,7 @@ #include <rte_dev.h> #include <fslmc_logs.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include "dpaa2_hw_pvt.h" #include "dpaa2_hw_dpio.h" #include <mc/fsl_dpmng.h> diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c index 28780717bd..223e34bcba 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c @@ -14,7 +14,6 @@ #include "private.h" #include <fslmc_logs.h> -#include <rte_fslmc.h> #include <mc/fsl_dprc.h> #include "portal/dpaa2_hw_pvt.h" diff --git a/drivers/bus/fslmc/private.h b/drivers/bus/fslmc/private.h index f08dc7716b..e7425d819b 100644 --- a/drivers/bus/fslmc/private.h +++ b/drivers/bus/fslmc/private.h @@ -7,7 +7,7 @@ #include <bus_driver.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> /* * FSLMC bus diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 8444f1a795..0cce861899 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -20,7 +20,7 @@ #include <rte_dev.h> #include <cryptodev_pmd.h> #include <rte_common.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <fslmc_vfio.h> #include <dpaa2_hw_pvt.h> #include <dpaa2_hw_dpio.h> diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c index e68a4875dd..b3242791ac 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c @@ -3,7 +3,7 @@ */ #include <cryptodev_pmd.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <fslmc_vfio.h> #include <dpaa2_hw_pvt.h> #include <dpaa2_hw_dpio.h> diff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c index 0500e8c225..d5a5f08ecc 100644 --- a/drivers/dma/dpaa2/dpaa2_qdma.c +++ b/drivers/dma/dpaa2/dpaa2_qdma.c @@ -3,7 +3,7 @@ */ #include <rte_eal.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <rte_dmadev.h> #include <rte_dmadev_pmd.h> #include <rte_kvargs.h> diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index ffc7b8b073..5de3e9e5f5 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -16,7 +16,7 @@ #include <rte_debug.h> #include <rte_dev.h> #include <rte_eal.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <rte_lcore.h> #include <rte_log.h> #include <rte_malloc.h> diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c index b549bdfcbb..941fb8fc43 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c +++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c @@ -19,7 +19,7 @@ #include <rte_random.h> #include <rte_bus_vdev.h> #include <rte_test.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include "dpaa2_eventdev.h" #include "dpaa2_eventdev_logs.h" diff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c index acc1fde771..3882a9cf1d 100644 --- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c +++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c @@ -20,7 +20,7 @@ #include <rte_dev.h> #include <ethdev_driver.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <mc/fsl_dpcon.h> #include <portal/dpaa2_hw_pvt.h> #include "dpaa2_eventdev.h" diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 52eb6df310..f876f4790c 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -16,7 +16,7 @@ #include <rte_cycles.h> #include <rte_kvargs.h> #include <rte_dev.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <rte_flow_driver.h> #include "rte_dpaa2_mempool.h" diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index a459181139..f69df95253 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -11,7 +11,7 @@ #include <rte_event_eth_rx_adapter.h> #include <rte_pmd_dpaa2.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <dpaa2_hw_pvt.h> #include "dpaa2_tm.h" diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c index e8689a7832..3289f388e1 100644 --- a/drivers/net/dpaa2/dpaa2_mux.c +++ b/drivers/net/dpaa2/dpaa2_mux.c @@ -16,7 +16,7 @@ #include <rte_flow_driver.h> #include <rte_tailq.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <fsl_dpdmux.h> #include <fsl_dpkg.h> diff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c index 4e6d375d1c..c08aa0f3bf 100644 --- a/drivers/net/dpaa2/dpaa2_ptp.c +++ b/drivers/net/dpaa2/dpaa2_ptp.c @@ -16,7 +16,7 @@ #include <rte_malloc.h> #include <rte_time.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <fsl_dprtc.h> #include <fsl_dpkg.h> diff --git a/drivers/net/dpaa2/dpaa2_recycle.c b/drivers/net/dpaa2/dpaa2_recycle.c index 336506dc0d..932570c6e0 100644 --- a/drivers/net/dpaa2/dpaa2_recycle.c +++ b/drivers/net/dpaa2/dpaa2_recycle.c @@ -15,7 +15,7 @@ #include <rte_cycles.h> #include <rte_kvargs.h> #include <rte_dev.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <rte_flow_driver.h> #include "dpaa2_pmd_logs.h" diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index c17f6ebda9..7b9c528d13 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -16,7 +16,7 @@ #include <rte_dev.h> #include <rte_hexdump.h> -#include <rte_fslmc.h> +#include <bus_fslmc_driver.h> #include <fslmc_vfio.h> #include <dpaa2_hw_pvt.h> #include <dpaa2_hw_dpio.h> -- 2.36.1