@@ -518,9 +518,9 @@ static struct rte_vdev_driver aesni_gcm_pmd_drv = {
.driver = {
.name = CRYPTODEV_NAME_AESNI_GCM_PMD,
.type = PMD_VDEV,
- .init = aesni_gcm_init,
- .uninit = aesni_gcm_uninit
},
+ .init = aesni_gcm_init,
+ .uninit = aesni_gcm_uninit,
};
RTE_EAL_VDRV_REGISTER(aesni_gcm_pmd_drv);
@@ -718,9 +718,9 @@ static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = {
.driver = {
.name = CRYPTODEV_NAME_AESNI_MB_PMD,
.type = PMD_VDEV,
- .init = cryptodev_aesni_mb_init,
- .uninit = cryptodev_aesni_mb_uninit
},
+ .init = cryptodev_aesni_mb_init,
+ .uninit = cryptodev_aesni_mb_uninit,
};
RTE_EAL_VDRV_REGISTER(cryptodev_aesni_mb_pmd_drv);
@@ -652,9 +652,9 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {
.driver = {
.name = CRYPTODEV_NAME_KASUMI_PMD,
.type = PMD_VDEV,
- .init = cryptodev_kasumi_init,
- .uninit = cryptodev_kasumi_uninit
},
+ .init = cryptodev_kasumi_init,
+ .uninit = cryptodev_kasumi_uninit,
};
RTE_EAL_VDRV_REGISTER(cryptodev_kasumi_pmd_drv);
@@ -272,9 +272,9 @@ static struct rte_vdev_driver cryptodev_null_pmd_drv = {
.driver = {
.name = CRYPTODEV_NAME_NULL_PMD,
.type = PMD_VDEV,
- .init = cryptodev_null_init,
- .uninit = cryptodev_null_uninit
},
+ .init = cryptodev_null_init,
+ .uninit = cryptodev_null_uninit,
};
RTE_EAL_VDRV_REGISTER(cryptodev_null_pmd_drv);
@@ -643,9 +643,9 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {
.driver = {
.name = CRYPTODEV_NAME_SNOW3G_PMD,
.type = PMD_VDEV,
- .init = cryptodev_snow3g_init,
- .uninit = cryptodev_snow3g_uninit
},
+ .init = cryptodev_snow3g_init,
+ .uninit = cryptodev_snow3g_uninit,
};
RTE_EAL_VDRV_REGISTER(cryptodev_snow3g_pmd_drv);
@@ -875,9 +875,9 @@ static struct rte_vdev_driver pmd_af_packet_drv = {
.driver = {
.name = "eth_af_packet",
.type = PMD_VDEV,
- .init = rte_pmd_af_packet_devinit,
- .uninit = rte_pmd_af_packet_devuninit,
},
+ .init = rte_pmd_af_packet_devinit,
+ .uninit = rte_pmd_af_packet_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_af_packet_drv);
@@ -2508,9 +2508,9 @@ static struct rte_vdev_driver bond_drv = {
.driver = {
.name = "eth_bond",
.type = PMD_VDEV,
- .init = bond_init,
- .uninit = bond_uninit,
},
+ .init = bond_init,
+ .uninit = bond_uninit,
};
RTE_EAL_VDRV_REGISTER(bond_drv);
@@ -1627,16 +1627,16 @@ static struct rte_vdev_driver pmd_mpipe_xgbe_drv = {
.driver = {
.name = "xgbe",
.type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit,
},
+ .init = rte_pmd_mpipe_devinit,
};
static struct rte_vdev_driver pmd_mpipe_gbe_drv = {
.driver = {
.name = "gbe",
.type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit,
},
+ .init = rte_pmd_mpipe_devinit,
};
RTE_EAL_VDRV_REGISTER(pmd_mpipe_xgbe_drv);
@@ -686,9 +686,9 @@ static struct rte_vdev_driver pmd_null_drv = {
.driver = {
.name = "eth_null",
.type = PMD_VDEV,
- .init = rte_pmd_null_devinit,
- .uninit = rte_pmd_null_devuninit,
},
+ .init = rte_pmd_null_devinit,
+ .uninit = rte_pmd_null_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_null_drv);
@@ -1087,9 +1087,9 @@ static struct rte_vdev_driver pmd_pcap_drv = {
.driver = {
.name = "eth_pcap",
.type = PMD_VDEV,
- .init = rte_pmd_pcap_devinit,
- .uninit = rte_pmd_pcap_devuninit,
},
+ .init = rte_pmd_pcap_devinit,
+ .uninit = rte_pmd_pcap_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_pcap_drv);
@@ -627,9 +627,9 @@ static struct rte_vdev_driver pmd_ring_drv = {
.driver = {
.name = "eth_ring",
.type = PMD_VDEV,
- .init = rte_pmd_ring_devinit,
- .uninit = rte_pmd_ring_devuninit,
},
+ .init = rte_pmd_ring_devinit,
+ .uninit = rte_pmd_ring_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_ring_drv);
@@ -921,9 +921,9 @@ static struct rte_vdev_driver pmd_vhost_drv = {
.driver = {
.name = "eth_vhost",
.type = PMD_VDEV,
- .init = rte_pmd_vhost_devinit,
- .uninit = rte_pmd_vhost_devuninit,
},
+ .init = rte_pmd_vhost_devinit,
+ .uninit = rte_pmd_vhost_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_vhost_drv);
@@ -760,9 +760,9 @@ static struct rte_vdev_driver pmd_xenvirt_drv = {
.driver = {
.name = "eth_xenvirt",
.type = PMD_VDEV,
- .init = rte_pmd_xenvirt_devinit,
- .uninit = rte_pmd_xenvirt_devuninit,
},
+ .init = rte_pmd_xenvirt_devinit,
+ .uninit = rte_pmd_xenvirt_devuninit,
};
RTE_EAL_VDRV_REGISTER(pmd_xenvirt_drv);
@@ -67,7 +67,7 @@ rte_eal_vdev_init(const char *name, const char *args)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name, strlen(driver->driver.name)))
- return driver->driver.init(name, args);
+ return driver->init(name, args);
}
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
@@ -90,7 +90,7 @@ rte_eal_vdev_uninit(const char *name)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name, strlen(driver->driver.name)))
- return driver->driver.uninit(name);
+ return driver->uninit(name);
}
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
@@ -105,16 +105,6 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
TAILQ_HEAD(rte_driver_list, rte_driver);
/**
- * Initialization function called for each device driver once.
- */
-typedef int (rte_dev_init_t)(const char *name, const char *args);
-
-/**
- * Uninitilization function called for each device driver once.
- */
-typedef int (rte_dev_uninit_t)(const char *name);
-
-/**
* Driver type enumeration
*/
enum pmd_type {
@@ -129,8 +119,6 @@ struct rte_driver {
TAILQ_ENTRY(rte_driver) next; /**< Next in list. */
enum pmd_type type; /**< PMD Driver type */
const char *name; /**< Driver name. */
- rte_dev_init_t *init; /**< Device init. function. */
- rte_dev_uninit_t *uninit; /**< Device uninit. function. */
};
/**
@@ -43,12 +43,25 @@ extern "C" {
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
+
+/**
+ * Initialization function called for each device driver once.
+ */
+typedef int (rte_vdev_init_t)(const char *name, const char *args);
+
+/**
+ * Uninitilization function called for each device driver once.
+ */
+typedef int (rte_vdev_uninit_t)(const char *name);
+
/**
* A virtual device driver abstraction.
*/
struct rte_vdev_driver {
TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
- struct rte_driver driver; /**< Inherited general driver. */
+ struct rte_driver driver; /**< Inherited general driver. */
+ rte_vdev_init_t *init; /**< Virtual device init. function. */
+ rte_vdev_uninit_t *uninit; /**< Virtual device uninit. function. */
};
/**