rte_device is a generic device which is available to the applications
and EAL. This patch replaces rte_pci_device in 'struct rte_eventdev'
and in 'struct rte_event_dev_info' with common rte_device.
Signed-off-by: Nipun Gupta <nipun.gu...@nxp.com>
Acked-by: Shreyansh Jain <shreyansh.j...@nxp.com>
---
drivers/event/skeleton/skeleton_eventdev.c | 2 +-
lib/librte_eventdev/rte_eventdev.c | 6 +++---
lib/librte_eventdev/rte_eventdev.h | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/event/skeleton/skeleton_eventdev.c
b/drivers/event/skeleton/skeleton_eventdev.c
index dee0faf..770dce3 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -383,7 +383,7 @@
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- pci_dev = eventdev->pci_dev;
+ pci_dev = RTE_DEV_TO_PCI(eventdev->dev);
skel->reg_base = (uintptr_t)pci_dev->mem_resource[0].addr;
if (!skel->reg_base) {
diff --git a/lib/librte_eventdev/rte_eventdev.c
b/lib/librte_eventdev/rte_eventdev.c
index 68bfc3b..b8be5da 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -125,7 +125,7 @@
dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns;
- dev_info->pci_dev = dev->pci_dev;
+ dev_info->dev = dev->dev;
if (dev->driver)
dev_info->driver_name = dev->driver->pci_drv.driver.name;
return 0;
@@ -1196,7 +1196,7 @@ struct rte_eventdev *
"device data");
}
- eventdev->pci_dev = pci_dev;
+ eventdev->dev = &pci_dev->device;
eventdev->driver = eventdrv;
/* Invoke PMD device initialization function */
@@ -1250,7 +1250,7 @@ struct rte_eventdev *
/* Free event device */
rte_event_pmd_release(eventdev);
- eventdev->pci_dev = NULL;
+ eventdev->dev = NULL;
eventdev->driver = NULL;
return 0;
diff --git a/lib/librte_eventdev/rte_eventdev.h
b/lib/librte_eventdev/rte_eventdev.h
index 7073987..6140078 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -330,7 +330,7 @@
*/
struct rte_event_dev_info {
const char *driver_name; /**< Event driver name */
- struct rte_pci_device *pci_dev; /**< PCI information */
+ struct rte_device *dev; /**< Device information */
uint32_t min_dequeue_timeout_ns;
/**< Minimum supported global dequeue timeout(ns) by this device */
uint32_t max_dequeue_timeout_ns;
@@ -1059,8 +1059,8 @@ struct rte_eventdev {
/**< Pointer to device data */
const struct rte_eventdev_ops *dev_ops;
/**< Functions exported by PMD */
- struct rte_pci_device *pci_dev;
- /**< PCI info. supplied by probing */
+ struct rte_device *dev;
+ /**< Device info. supplied by probing */
const struct rte_eventdev_driver *driver;
/**< Driver for this device */
--
1.9.1
