pci: make device id tables const

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index 83c589e..d2adc66 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -340,19 +340,19 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        ret = pci_get_kernel_driver_by_path(filename, driver);
        if (!ret) {
                if (!strcmp(driver, "vfio-pci"))
-                       dev->pt_driver = RTE_PT_VFIO;
+                       dev->kdrv = RTE_KDRV_VFIO;
                else if (!strcmp(driver, "igb_uio"))
-                       dev->pt_driver = RTE_PT_IGB_UIO;
+                       dev->kdrv = RTE_KDRV_IGB_UIO;
                else if (!strcmp(driver, "uio_pci_generic"))
-                       dev->pt_driver = RTE_PT_UIO_GENERIC;
+                       dev->kdrv = RTE_KDRV_UIO_GENERIC;
                else
-                       dev->pt_driver = RTE_PT_UNKNOWN;
+                       dev->kdrv = RTE_KDRV_UNKNOWN;
        } else if (ret < 0) {
                RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
                free(dev);
                return -1;
        } else
-               dev->pt_driver = RTE_PT_UNKNOWN;
+               dev->kdrv = RTE_KDRV_UNKNOWN;
 
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
@@ -370,8 +370,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
                                TAILQ_INSERT_BEFORE(dev2, dev, next);
                                return 0;
                        } else { /* already registered */
-                               /* update pt_driver */
-                               dev2->pt_driver = dev->pt_driver;
+                               dev2->kdrv = dev->kdrv;
                                dev2->max_vfs = dev->max_vfs;
                                memmove(dev2->mem_resource,
                                        dev->mem_resource,
@@ -570,20 +569,20 @@ pci_map_device(struct rte_pci_device *dev)
        int ret = -1;
 
        /* try mapping the NIC resources using VFIO if it exists */
-       switch (dev->pt_driver) {
-       case RTE_PT_VFIO:
+       switch (dev->kdrv) {
+       case RTE_KDRV_VFIO:
 #ifdef VFIO_PRESENT
                if (pci_vfio_is_enabled())
                        ret = pci_vfio_map_resource(dev);
 #endif
                break;
-       case RTE_PT_IGB_UIO:
-       case RTE_PT_UIO_GENERIC:
+       case RTE_KDRV_IGB_UIO:
+       case RTE_KDRV_UIO_GENERIC:
                /* map resources for devices that use uio */
                ret = pci_uio_map_resource(dev);
                break;
        default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by known pt driver,"
+               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
                        " skipped\n");
                ret = 1;
                break;
@@ -600,17 +599,17 @@ pci_unmap_device(struct rte_pci_device *dev)
                return;
 
        /* try unmapping the NIC resources using VFIO if it exists */
-       switch (dev->pt_driver) {
-       case RTE_PT_VFIO:
+       switch (dev->kdrv) {
+       case RTE_KDRV_VFIO:
                RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n");
                break;
-       case RTE_PT_IGB_UIO:
-       case RTE_PT_UIO_GENERIC:
+       case RTE_KDRV_IGB_UIO:
+       case RTE_KDRV_UIO_GENERIC:
                /* unmap resources for devices that use uio */
                pci_uio_unmap_resource(dev);
                break;
        default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by known pt driver,"
+               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
                        " skipped\n");
                break;
        }
@@ -625,9 +624,9 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
        int ret;
-       struct rte_pci_id *id_table;
+       const struct rte_pci_id *id_table;
 
-       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+       for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) {
 
                /* check if device's identifiers match the driver's ones */
                if (id_table->vendor_id != dev->id.vendor_id &&
@@ -697,12 +696,12 @@ int
 rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
                struct rte_pci_device *dev)
 {
-       struct rte_pci_id *id_table;
+       const struct rte_pci_id *id_table;
 
        if ((dr == NULL) || (dev == NULL))
                return -EINVAL;
 
-       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+       for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) {
 
                /* check if device's identifiers match the driver's ones */
                if (id_table->vendor_id != dev->id.vendor_id &&