The macros for tagging/exporting informations about a driver do not need to be exported in the public API. Move this to driver only header.
Signed-off-by: David Marchand <david.march...@redhat.com> --- lib/eal/include/dev_driver.h | 41 ++++++++++++++++++++++++++++++++++++ lib/eal/include/rte_dev.h | 41 ------------------------------------ 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/eal/include/dev_driver.h b/lib/eal/include/dev_driver.h index c07d83a43a..22e48226f9 100644 --- a/lib/eal/include/dev_driver.h +++ b/lib/eal/include/dev_driver.h @@ -30,4 +30,45 @@ struct rte_device { struct rte_devargs *devargs; /**< Arguments for latest probing */ }; +#define RTE_PMD_EXPORT_NAME_ARRAY(n, idx) n##idx[] + +#define RTE_PMD_EXPORT_NAME(name, idx) \ +static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ +__rte_used = RTE_STR(name) + +#define DRV_EXP_TAG(name, tag) __##name##_##tag + +#define RTE_PMD_REGISTER_PCI_TABLE(name, table) \ +static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ +RTE_STR(table) + +#define RTE_PMD_REGISTER_PARAM_STRING(name, str) \ +static const char DRV_EXP_TAG(name, param_string_export)[] \ +__rte_used = str + +/** + * Advertise the list of kernel modules required to run this driver + * + * This string lists the kernel modules required for the devices + * associated to a PMD. The format of each line of the string is: + * "<device-pattern> <kmod-expression>". + * + * The possible formats for the device pattern are: + * "*" all devices supported by this driver + * "pci:*" all PCI devices supported by this driver + * "pci:v8086:d*:sv*:sd*" all PCI devices supported by this driver + * whose vendor id is 0x8086. + * + * The format of the kernel modules list is a parenthesized expression + * containing logical-and (&) and logical-or (|). + * + * The device pattern and the kmod expression are separated by a space. + * + * Example: + * - "* igb_uio | uio_pci_generic | vfio" + */ +#define RTE_PMD_REGISTER_KMOD_DEP(name, str) \ +static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ +__rte_used = str + #endif /* DEV_DRIVER_H */ diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 738400e8d1..7eca5e8cf2 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -232,47 +232,6 @@ int rte_dev_remove(struct rte_device *dev); */ typedef int (*rte_dev_cmp_t)(const struct rte_device *dev, const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY(n, idx) n##idx[] - -#define RTE_PMD_EXPORT_NAME(name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) - -#define DRV_EXP_TAG(name, tag) __##name##_##tag - -#define RTE_PMD_REGISTER_PCI_TABLE(name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) - -#define RTE_PMD_REGISTER_PARAM_STRING(name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str - -/** - * Advertise the list of kernel modules required to run this driver - * - * This string lists the kernel modules required for the devices - * associated to a PMD. The format of each line of the string is: - * "<device-pattern> <kmod-expression>". - * - * The possible formats for the device pattern are: - * "*" all devices supported by this driver - * "pci:*" all PCI devices supported by this driver - * "pci:v8086:d*:sv*:sd*" all PCI devices supported by this driver - * whose vendor id is 0x8086. - * - * The format of the kernel modules list is a parenthesized expression - * containing logical-and (&) and logical-or (|). - * - * The device pattern and the kmod expression are separated by a space. - * - * Example: - * - "* igb_uio | uio_pci_generic | vfio" - */ -#define RTE_PMD_REGISTER_KMOD_DEP(name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str - /** * Iteration context. * -- 2.49.0