From patchwork Fri Jul 5 09:34:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 56129 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4FB131BE05; Fri, 5 Jul 2019 11:34:41 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 6F37A1BE05 for ; Fri, 5 Jul 2019 11:34:39 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2019 02:34:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,454,1557212400"; d="scan'208";a="172608225" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by FMSMGA003.fm.intel.com with ESMTP; 05 Jul 2019 02:34:16 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, shreyansh.jain@nxp.com, hemant.agrawal@nxp.com, Bruce Richardson Date: Fri, 5 Jul 2019 10:34:01 +0100 Message-Id: <20190705093401.69913-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190705093401.69913-1-bruce.richardson@intel.com> References: <20190705093401.69913-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC PATCH 2/2] drivers/raw: standardize name format of rawdev drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The driver names for rawdevs were both different in make and meson builds and were non-standard in the make version in that some included "rawdev" in the name while others didn't. Therefore, for global consistency of naming, we can use "rte_rawdev" rather than "rte_pmd" for the prefix for the libraries. While most other driver categories use "rte_pmd" as a prefix, there is precedent for this in the mempool drivers use "rte_mempool" as a prefix. Signed-off-by: Bruce Richardson --- drivers/raw/dpaa2_cmdif/Makefile | 4 ++-- ..._version.map => rte_rawdev_dpaa2_cmdif_version.map} | 0 drivers/raw/dpaa2_qdma/Makefile | 4 ++-- ...a_version.map => rte_rawdev_dpaa2_qdma_version.map} | 0 drivers/raw/ifpga/Makefile | 4 ++-- ..._ifpga_version.map => rte_rawdev_ifpga_version.map} | 0 drivers/raw/ioat/Makefile | 4 ++-- ...md_ioat_version.map => rte_rawdev_ioat_version.map} | 0 drivers/raw/meson.build | 2 +- drivers/raw/skeleton/Makefile | 4 ++-- ...ton_version.map => rte_rawdev_skeleton_version.map} | 0 mk/rte.app.mk | 10 +++++----- 12 files changed, 16 insertions(+), 16 deletions(-) rename drivers/raw/dpaa2_cmdif/{rte_pmd_dpaa2_cmdif_version.map => rte_rawdev_dpaa2_cmdif_version.map} (100%) rename drivers/raw/dpaa2_qdma/{rte_pmd_dpaa2_qdma_version.map => rte_rawdev_dpaa2_qdma_version.map} (100%) rename drivers/raw/ifpga/{rte_pmd_ifpga_version.map => rte_rawdev_ifpga_version.map} (100%) rename drivers/raw/ioat/{rte_pmd_ioat_version.map => rte_rawdev_ioat_version.map} (100%) rename drivers/raw/skeleton/{rte_pmd_skeleton_version.map => rte_rawdev_skeleton_version.map} (100%) diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile index 9bd5ff229..2b4150c2d 100644 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ b/drivers/raw/dpaa2_cmdif/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_dpaa2_cmdif.a +LIB = librte_rawdev_dpaa2_cmdif.a CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 @@ -23,7 +23,7 @@ LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -lrte_rawdev LDLIBS += -lrte_common_dpaax -EXPORT_MAP := rte_pmd_dpaa2_cmdif_version.map +EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map LIBABIVER := 2 diff --git a/drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map similarity index 100% rename from drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map rename to drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile index f9a810cc6..0009fd4c6 100644 --- a/drivers/raw/dpaa2_qdma/Makefile +++ b/drivers/raw/dpaa2_qdma/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_dpaa2_qdma.a +LIB = librte_rawdev_dpaa2_qdma.a CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 @@ -24,7 +24,7 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_ring LDLIBS += -lrte_common_dpaax -EXPORT_MAP := rte_pmd_dpaa2_qdma_version.map +EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map LIBABIVER := 3 diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map similarity index 100% rename from drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map rename to drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile index 5fa9303d5..655b29288 100644 --- a/drivers/raw/ifpga/Makefile +++ b/drivers/raw/ifpga/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_ifpga_rawdev.a +LIB = librte_rawdev_ifpga.a CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 @@ -21,7 +21,7 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_bus_pci LDLIBS += -lrte_bus_ifpga -EXPORT_MAP := rte_pmd_ifpga_version.map +EXPORT_MAP := rte_rawdev_ifpga_version.map LIBABIVER := 1 diff --git a/drivers/raw/ifpga/rte_pmd_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map similarity index 100% rename from drivers/raw/ifpga/rte_pmd_ifpga_version.map rename to drivers/raw/ifpga/rte_rawdev_ifpga_version.map diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile index 32f079845..e852afb57 100644 --- a/drivers/raw/ioat/Makefile +++ b/drivers/raw/ioat/Makefile @@ -4,7 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name -LIB = librte_pmd_ioat_rawdev.a +LIB = librte_rawdev_ioat.a # build flags CFLAGS += -O3 @@ -18,7 +18,7 @@ LDLIBS += -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_ioat_version.map +EXPORT_MAP := rte_rawdev_ioat_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c diff --git a/drivers/raw/ioat/rte_pmd_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map similarity index 100% rename from drivers/raw/ioat/rte_pmd_ioat_version.map rename to drivers/raw/ioat/rte_rawdev_ioat_version.map diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index 23dd3ccff..289017989 100644 --- a/drivers/raw/meson.build +++ b/drivers/raw/meson.build @@ -6,4 +6,4 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma', 'skeleton'] std_deps = ['rawdev'] config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV' -driver_name_fmt = 'rte_pmd_@0@' +driver_name_fmt = 'rte_rawdev_@0@' diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile index 9641e6505..783b1e952 100644 --- a/drivers/raw/skeleton/Makefile +++ b/drivers/raw/skeleton/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_skeleton_rawdev.a +LIB = librte_rawdev_skeleton.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) @@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdev LDLIBS += -lrte_kvargs -EXPORT_MAP := rte_pmd_skeleton_version.map +EXPORT_MAP := rte_rawdev_skeleton_version.map LIBABIVER := 1 diff --git a/drivers/raw/skeleton/rte_pmd_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map similarity index 100% rename from drivers/raw/skeleton/rte_pmd_skeleton_version.map rename to drivers/raw/skeleton/rte_rawdev_skeleton_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 30f9a12da..c7c590bea 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -299,17 +299,17 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event endif # CONFIG_RTE_LIBRTE_EVENTDEV ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_pmd_skeleton_rawdev +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_pmd_dpaa2_cmdif -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_pmd_dpaa2_qdma +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma endif # CONFIG_RTE_LIBRTE_FSLMC_BUS _LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_pmd_ifpga_rawdev +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_rawdev_ifpga _LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke endif # CONFIG_RTE_LIBRTE_IFPGA_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_pmd_ioat_rawdev +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_rawdev_ioat endif # CONFIG_RTE_LIBRTE_RAWDEV endif # !CONFIG_RTE_BUILD_SHARED_LIBS