[dpdk-dev] [PATCH v16 6/6] examples/l2fwd-ethtool: replace lib with new API name

[Liang-Min Larry Wang]

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 <liang-min.wang at intel.com>
---
 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, &reg_info);
+       status = rte_eth_dev_get_reg_info(port_id, &reg_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