From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id CA984B0BC for ; Tue, 15 Apr 2014 20:07:13 +0200 (CEST) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1Wa7lG-00030i-KV; Tue, 15 Apr 2014 14:07:12 -0400 From: Neil Horman To: dev@dpdk.org Date: Tue, 15 Apr 2014 14:06:04 -0400 Message-Id: <1397585169-14537-11-git-send-email-nhorman@tuxdriver.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com> References: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com> X-Spam-Score: -2.9 (--) X-Spam-Status: No Subject: [dpdk-dev] [PATCH 10/15] e1000: Convert to use of PMD_REGISTER_DRIVER and fix linking X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 18:07:14 -0000 convert the e1000 pmd driver to use the PMD_REGISTER_DRIVER macro. This means that the test applications now have no reference to the e1000 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 --- lib/librte_ether/rte_ethdev.h | 16 ---------------- lib/librte_pmd_e1000/em_ethdev.c | 13 +++++++++++-- mk/rte.app.mk | 8 ++++---- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index d13cc4f..9e32f56 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1316,15 +1316,6 @@ struct eth_driver { extern void rte_eth_driver_register(struct eth_driver *eth_drv); /** - * The initialization function of the driver for - * Intel(r) EM Gigabit Ethernet Controller devices. - * This function is invoked once at EAL start time. - * @return - * 0 on success - */ -extern int rte_em_pmd_init(void); - -/** * The initialization function of the driver for 10Gbps Intel IXGBE * Ethernet devices. * Invoked once at EAL start time. @@ -1383,13 +1374,6 @@ int rte_pmd_init_all(void) { int ret = -ENODEV; -#ifdef RTE_LIBRTE_EM_PMD - if ((ret = rte_em_pmd_init()) != 0) { - RTE_LOG(ERR, PMD, "Cannot init em PMD\n"); - return (ret); - } -#endif /* RTE_LIBRTE_EM_PMD */ - #ifdef RTE_LIBRTE_IXGBE_PMD if ((ret = rte_ixgbe_pmd_init()) != 0) { RTE_LOG(ERR, PMD, "Cannot init ixgbe PMD\n"); diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c index d8c9a9b..858aa7c 100644 --- a/lib/librte_pmd_e1000/em_ethdev.c +++ b/lib/librte_pmd_e1000/em_ethdev.c @@ -51,6 +51,8 @@ #include #include #include +#include +#include #include "e1000_logs.h" #include "e1000/e1000_api.h" @@ -285,8 +287,8 @@ static struct eth_driver rte_em_pmd = { .dev_private_size = sizeof(struct e1000_adapter), }; -int -rte_em_pmd_init(void) +static int +rte_em_pmd_init(const char *name __rte_unused, const char *params __rte_unused) { rte_eth_driver_register(&rte_em_pmd); return 0; @@ -1433,3 +1435,10 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index) e1000_rar_set(hw, addr, index); } + +struct rte_driver em_pmd_drv = { + .type = PMD_PDEV, + .init = rte_em_pmd_init, +}; + +PMD_REGISTER_DRIVER(em_pmd_drv); diff --git a/mk/rte.app.mk b/mk/rte.app.mk index e77bf39..f5f137c 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -73,10 +73,6 @@ LDLIBS += -lrte_ivshmem endif endif -ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) -LDLIBS += -lrte_pmd_e1000 -endif - ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) LDLIBS += -lrte_pmd_ixgbe endif @@ -169,6 +165,10 @@ endif ifeq ($(RTE_BUILD_SHARED_LIB),n) +ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) +LDLIBS += -lrte_pmd_e1000 +endif + ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) LDLIBS += -lrte_pmd_ring endif -- 1.8.3.1