[RFC,1/2] drivers/raw: remove rawdev from driver directory names
Checks
Commit Message
The ifpga and skeleton rawdev drivers included "rawdev" in their directory
names, which was superfluous given that they were in the drivers/raw
directory. Shorten the names via this patch.
For meson builds, this will rename the final library .so/.a files
produced, but those will be renamed again later via a patch to
standardize rawdev names.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/raw/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c | 0
.../{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h | 0
.../{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
.../rte_pmd_ifpga_version.map} | 0
drivers/raw/meson.build | 4 ++--
drivers/raw/{skeleton_rawdev => skeleton}/Makefile | 2 +-
drivers/raw/{skeleton_rawdev => skeleton}/meson.build | 0
.../rte_pmd_skeleton_version.map} | 0
drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c | 0
drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h | 0
.../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c | 0
52 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/raw/{ifpga_rawdev => ifpga}/Makefile (86%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%)
rename drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map => ifpga/rte_pmd_ifpga_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/Makefile (91%)
rename drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%)
rename drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map => skeleton/rte_pmd_skeleton_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c (100%)
@@ -4,12 +4,12 @@
include $(RTE_SDK)/mk/rte.vars.mk
# DIRS-$(<configuration>) += <directory>
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma
endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
include $(RTE_SDK)/mk/rte.subdir.mk
similarity index 86%
rename from drivers/raw/ifpga_rawdev/Makefile
rename to drivers/raw/ifpga/Makefile
@@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs
LDLIBS += -lrte_bus_pci
LDLIBS += -lrte_bus_ifpga
-EXPORT_MAP := rte_pmd_ifpga_rawdev_version.map
+EXPORT_MAP := rte_pmd_ifpga_version.map
LIBABIVER := 1
VPATH += $(SRCDIR)/base
-include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
+include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
#
# all source are stored in SRCS-y
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/Makefile
rename to drivers/raw/ifpga/base/Makefile
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/README
rename to drivers/raw/ifpga/base/README
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.c
rename to drivers/raw/ifpga/base/ifpga_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.h
rename to drivers/raw/ifpga/base/ifpga_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_compat.h
rename to drivers/raw/ifpga/base/ifpga_compat.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_defines.h
rename to drivers/raw/ifpga/base/ifpga_defines.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
rename to drivers/raw/ifpga/base/ifpga_enumerate.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
rename to drivers/raw/ifpga/base/ifpga_enumerate.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
rename to drivers/raw/ifpga/base/ifpga_feature_dev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
rename to drivers/raw/ifpga/base/ifpga_feature_dev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme.c
rename to drivers/raw/ifpga/base/ifpga_fme.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_dperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
rename to drivers/raw/ifpga/base/ifpga_fme_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_iperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
rename to drivers/raw/ifpga/base/ifpga_fme_pr.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_hw.h
rename to drivers/raw/ifpga/base/ifpga_hw.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port.c
rename to drivers/raw/ifpga/base/ifpga_port.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
rename to drivers/raw/ifpga/base/ifpga_port_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/meson.build
rename to drivers/raw/ifpga/base/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
rename to drivers/raw/ifpga/base/opae_at24_eeprom.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
rename to drivers/raw/ifpga/base/opae_at24_eeprom.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.c
rename to drivers/raw/ifpga/base/opae_debug.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.h
rename to drivers/raw/ifpga/base/opae_debug.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.c
rename to drivers/raw/ifpga/base/opae_eth_group.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.h
rename to drivers/raw/ifpga/base/opae_eth_group.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.c
rename to drivers/raw/ifpga/base/opae_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.h
rename to drivers/raw/ifpga/base/opae_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.c
rename to drivers/raw/ifpga/base/opae_i2c.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.h
rename to drivers/raw/ifpga/base/opae_i2c.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
rename to drivers/raw/ifpga/base/opae_intel_max10.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
rename to drivers/raw/ifpga/base/opae_intel_max10.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_osdep.h
rename to drivers/raw/ifpga/base/opae_osdep.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.c
rename to drivers/raw/ifpga/base/opae_spi.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.h
rename to drivers/raw/ifpga/base/opae_spi.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
rename to drivers/raw/ifpga/base/opae_spi_transaction.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.c
rename to drivers/raw/ifpga/ifpga_rawdev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.h
rename to drivers/raw/ifpga/ifpga_rawdev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/meson.build
rename to drivers/raw/ifpga/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
rename to drivers/raw/ifpga/rte_pmd_ifpga_version.map
@@ -2,8 +2,8 @@
# Copyright 2018 NXP
drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
- 'ifpga_rawdev', 'ioat',
- 'skeleton_rawdev']
+ 'ifpga', 'ioat',
+ 'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
driver_name_fmt = 'rte_pmd_@0@'
similarity index 91%
rename from drivers/raw/skeleton_rawdev/Makefile
rename to drivers/raw/skeleton/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev
LDLIBS += -lrte_bus_vdev
LDLIBS += -lrte_kvargs
-EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map
+EXPORT_MAP := rte_pmd_skeleton_version.map
LIBABIVER := 1
similarity index 100%
rename from drivers/raw/skeleton_rawdev/meson.build
rename to drivers/raw/skeleton/meson.build
similarity index 100%
rename from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
rename to drivers/raw/skeleton/rte_pmd_skeleton_version.map
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.c
rename to drivers/raw/skeleton/skeleton_rawdev.c
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.h
rename to drivers/raw/skeleton/skeleton_rawdev.h
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
rename to drivers/raw/skeleton/skeleton_rawdev_test.c