From 3f86ca7f79f1d36811f029a5c50f0541481e0cb1 Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Fri, 7 Jul 2017 02:04:27 +0200 Subject: [PATCH] eal: move kernel driver enum out of PCI header Device kernel module is a device attribute. It is used in generic device structures and must not be tied to a bus. Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/include/rte_dev.h | 12 ++++++++++++ lib/librte_eal/common/include/rte_pci.h | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 0c8f6c8022..bcd8b1e5b9 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -114,6 +114,18 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...) } \ } while (0) +/** + * Device driver. + */ +enum rte_kernel_driver { + RTE_KDRV_UNKNOWN = 0, + RTE_KDRV_IGB_UIO, + RTE_KDRV_VFIO, + RTE_KDRV_UIO_GENERIC, + RTE_KDRV_NIC_UIO, + RTE_KDRV_NONE, +}; + /** * A generic memory resource representation. */ diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 406d91828a..8b123391c3 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -117,15 +117,6 @@ struct rte_pci_addr { struct rte_devargs; -enum rte_kernel_driver { - RTE_KDRV_UNKNOWN = 0, - RTE_KDRV_IGB_UIO, - RTE_KDRV_VFIO, - RTE_KDRV_UIO_GENERIC, - RTE_KDRV_NIC_UIO, - RTE_KDRV_NONE, -}; - /** * A structure describing a PCI device. */ -- 2.20.1