d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

igb: convert to use of PMD_REGISTER_DRIVER and fix linking

Browse Source 
Convert the igb pmd driver to use the PMD_REGISTER_DRIVER macro.
This means that the test applications now have no reference to the igb library
when building DSO's and must specify its use on the command line with the -d
option.  Static linking will still initalize the driver automatically.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
Neil Horman 2014-04-21 10:59:32 -04:00 committed by Thomas Monjalon
parent ca5834b7af
commit d93c252e88
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/dpdk_qat/main.c
View File

@ -697,10 +697,6 @@ MAIN(int argc, char **argv)
return -1;
/* init driver */
#ifdef RTE_LIBRTE_IGB_PMD
if (rte_igb_pmd_init() < 0)
rte_panic("Cannot init igb pmd\n");
#endif
#ifdef RTE_LIBRTE_IXGBE_PMD
if (rte_ixgbe_pmd_init() < 0)
rte_panic("Cannot init ixgbe pmd\n");

13
lib/librte_ether/rte_ethdev.h
View File

@ -1315,15 +1315,6 @@ struct eth_driver {
*/
extern void rte_eth_driver_register(struct eth_driver *eth_drv);
/**
* The initialization function of the driver for
* Intel(r) IGB Gigabit Ethernet Controller devices.
* This function is invoked once at EAL start time.
* @return
* 0 on success
*/
extern int rte_igb_pmd_init(void);
/**
* The initialization function of the driver for 1Gbps Intel IGB_VF
* Ethernet devices.
@ -1393,10 +1384,6 @@ int rte_pmd_init_all(void)
int ret = -ENODEV;
#ifdef RTE_LIBRTE_IGB_PMD
if ((ret = rte_igb_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init igb PMD\n");
return (ret);
}
if ((ret = rte_igbvf_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init igbvf PMD\n");
return (ret);

12
lib/librte_pmd_e1000/igb_ethdev.c
View File

@ -51,6 +51,7 @@
#include <rte_eal.h>
#include <rte_atomic.h>
#include <rte_malloc.h>
#include <rte_dev.h>
#include "e1000_logs.h"
#include "e1000/e1000_api.h"
@ -619,8 +620,8 @@ static struct eth_driver rte_igbvf_pmd = {
.dev_private_size = sizeof(struct e1000_adapter),
};
int
rte_igb_pmd_init(void)
static int
rte_igb_pmd_init(const char *name __rte_unused, const char *params __rte_unused)
{
rte_eth_driver_register(&rte_igb_pmd);
return 0;
@ -2182,3 +2183,10 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
return 0;
}
static struct rte_driver pmd_igb_drv = {
.type = PMD_PDEV,
.init = rte_igb_pmd_init,
};
PMD_REGISTER_DRIVER(pmd_igb_drv);