From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 262725A0A for ; Tue, 14 Jul 2015 15:13:44 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 14 Jul 2015 06:12:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,471,1432623600"; d="scan'208";a="746889167" Received: from jcyip-mobl3.amr.corp.intel.com (HELO lwang14-MOBL6.amr.corp.intel.com) ([10.254.232.144]) by fmsmga001.fm.intel.com with ESMTP; 14 Jul 2015 06:12:11 -0700 From: Liang-Min Larry Wang To: dev@dpdk.org Date: Tue, 14 Jul 2015 09:11:56 -0400 Message-Id: <1436879516-8136-7-git-send-email-liang-min.wang@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436879516-8136-1-git-send-email-liang-min.wang@intel.com> References: <1432946276-9424-1-git-send-email-liang-min.wang@intel.com> <1436879516-8136-1-git-send-email-liang-min.wang@intel.com> Cc: Liang-Min Larry Wang Subject: [dpdk-dev] [PATCH v16 6/6] examples/l2fwd-ethtool: replace lib with new API name 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, 14 Jul 2015 13:13:44 -0000 I. Change lib/rte_ethtool.c with new API name (rte_eth_dev_get_reg_length, rte_eth_dev_get_reg_info and rte_eth_dev_get_eeprom_length) II. Change l2fwd-app/Makefile to adapt build directory change Signed-off-by: Liang-Min Larry Wang --- examples/l2fwd-ethtool/l2fwd-app/Makefile | 3 +-- examples/l2fwd-ethtool/lib/rte_ethtool.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/l2fwd-ethtool/l2fwd-app/Makefile b/examples/l2fwd-ethtool/l2fwd-app/Makefile index fd0b9a7..5f45a79 100644 --- a/examples/l2fwd-ethtool/l2fwd-app/Makefile +++ b/examples/l2fwd-ethtool/l2fwd-app/Makefile @@ -52,9 +52,8 @@ SRCS-y := main.c CFLAGS += -O3 -D_GNU_SOURCE -pthread -I$(SRCDIR)/../lib CFLAGS += $(WERROR_FLAGS) -LIBDIRS += -L$(S)/../lib/l2fwd-ethtool/lib/$(RTE_TARGET)/lib -LIBDIRS += -L$(S)/../lib/$(RTE_TARGET)/lib LIBDIRS += -L$(S)/../build/lib +LIBDIRS += -L$(subst l2fwd-app,lib,$(RTE_OUTPUT)) LDLIBS += $(LIBDIRS) -lrte_ethtool include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/l2fwd-ethtool/lib/rte_ethtool.c b/examples/l2fwd-ethtool/lib/rte_ethtool.c index 744cb0c..2012f64 100644 --- a/examples/l2fwd-ethtool/lib/rte_ethtool.c +++ b/examples/l2fwd-ethtool/lib/rte_ethtool.c @@ -55,13 +55,13 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) dev_info.pci_dev->addr.domain, dev_info.pci_dev->addr.bus, dev_info.pci_dev->addr.devid, dev_info.pci_dev->addr.function); - n = rte_eth_dev_reg_length(port_id); + n = rte_eth_dev_get_reg_length(port_id); if (n > 0) drvinfo->regdump_len = n; else drvinfo->regdump_len = 0; - n = rte_eth_dev_eeprom_length(port_id); + n = rte_eth_dev_get_eeprom_length(port_id); if (n > 0) drvinfo->eedump_len = n; else @@ -76,7 +76,7 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) int rte_ethtool_get_regs_len(uint8_t port_id) { - return rte_eth_dev_reg_length(port_id); + return rte_eth_dev_get_reg_length(port_id); } int @@ -88,7 +88,7 @@ rte_ethtool_get_regs(uint8_t port_id, struct ethtool_regs *regs, void *buf) reg_info.buf = buf; reg_info.leng = 0; - status = rte_eth_dev_reg_info(port_id, ®_info); + status = rte_eth_dev_get_reg_info(port_id, ®_info); if (status) return status; regs->version = reg_info.version; @@ -108,7 +108,7 @@ rte_ethtool_get_link(uint8_t port_id) int rte_ethtool_get_eeprom_len(uint8_t port_id) { - return rte_eth_dev_eeprom_length(port_id); + return rte_eth_dev_get_eeprom_length(port_id); } int -- 2.1.4