drivers/raw: remove rawdev from directory names

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> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
bluca · Jul 30, 2019 · 473c88f · 473c88f
1 parent 6420da3
commit 473c88f
Show file tree

Hide file tree

Showing 56 changed files with 13 additions and 13 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL
 M: Shreyansh Jain <shreyansh.jain@nxp.com>
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
 F: lib/librte_rawdev/
-F: drivers/raw/skeleton_rawdev/
+F: drivers/raw/skeleton/
 F: app/test/test_rawdev.c
 F: doc/guides/prog_guide/rawdev.rst
 
@@ -1103,13 +1103,13 @@ Rawdev Drivers
 Intel FPGA
 M: Rosen Xu <rosen.xu@intel.com>
 M: Tianfei zhang <tianfei.zhang@intel.com>
-F: drivers/raw/ifpga_rawdev/
-F: doc/guides/rawdevs/ifpga_rawdev.rst
+F: drivers/raw/ifpga/
+F: doc/guides/rawdevs/ifpga.rst
 
 IOAT Rawdev
 M: Bruce Richardson <bruce.richardson@intel.com>
 F: drivers/raw/ioat/
-F: doc/guides/rawdevs/ioat_rawdev.rst
+F: doc/guides/rawdevs/ioat.rst
 
 NXP DPAA2 QDMA
 M: Nipun Gupta <nipun.gupta@nxp.com>

diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst → doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga_rawdev.rst → doc/guides/rawdevs/ifpga.rst
diff --git a/doc/guides/rawdevs/index.rst b/doc/guides/rawdevs/index.rst
@@ -13,7 +13,7 @@ application through rawdev API.
 
     dpaa2_cmdif
     dpaa2_qdma
-    ifpga_rawdev
-    ioat_rawdev
+    ifpga
+    ioat
     ntb
     octeontx2_dma
diff --git a/doc/guides/rawdevs/ioat_rawdev.rst → doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat_rawdev.rst → doc/guides/rawdevs/ioat.rst
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
@@ -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
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma

diff --git a/drivers/raw/ifpga_rawdev/Makefile → drivers/raw/ifpga/Makefile b/drivers/raw/ifpga_rawdev/Makefile → 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

diff --git a/drivers/raw/ifpga_rawdev/base/Makefile → drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga_rawdev/base/Makefile → drivers/raw/ifpga/base/Makefile
diff --git a/drivers/raw/ifpga_rawdev/base/README → drivers/raw/ifpga/base/README b/drivers/raw/ifpga_rawdev/base/README → drivers/raw/ifpga/base/README
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c → drivers/raw/ifpga/base/ifpga_api.c b/drivers/raw/ifpga_rawdev/base/ifpga_api.c → drivers/raw/ifpga/base/ifpga_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h → drivers/raw/ifpga/base/ifpga_api.h b/drivers/raw/ifpga_rawdev/base/ifpga_api.h → drivers/raw/ifpga/base/ifpga_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h → drivers/raw/ifpga/base/ifpga_compat.h b/drivers/raw/ifpga_rawdev/base/ifpga_compat.h → drivers/raw/ifpga/base/ifpga_compat.h
diff --git a/...ers/raw/ifpga_rawdev/base/ifpga_defines.h → drivers/raw/ifpga/base/ifpga_defines.h b/...ers/raw/ifpga_rawdev/base/ifpga_defines.h → drivers/raw/ifpga/base/ifpga_defines.h
diff --git a/...s/raw/ifpga_rawdev/base/ifpga_enumerate.c → drivers/raw/ifpga/base/ifpga_enumerate.c b/...s/raw/ifpga_rawdev/base/ifpga_enumerate.c → drivers/raw/ifpga/base/ifpga_enumerate.c
diff --git a/...s/raw/ifpga_rawdev/base/ifpga_enumerate.h → drivers/raw/ifpga/base/ifpga_enumerate.h b/...s/raw/ifpga_rawdev/base/ifpga_enumerate.h → drivers/raw/ifpga/base/ifpga_enumerate.h
diff --git a/...raw/ifpga_rawdev/base/ifpga_feature_dev.c → drivers/raw/ifpga/base/ifpga_feature_dev.c b/...raw/ifpga_rawdev/base/ifpga_feature_dev.c → drivers/raw/ifpga/base/ifpga_feature_dev.c
diff --git a/...raw/ifpga_rawdev/base/ifpga_feature_dev.h → drivers/raw/ifpga/base/ifpga_feature_dev.h b/...raw/ifpga_rawdev/base/ifpga_feature_dev.h → drivers/raw/ifpga/base/ifpga_feature_dev.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c → drivers/raw/ifpga/base/ifpga_fme.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme.c → drivers/raw/ifpga/base/ifpga_fme.c
diff --git a/...s/raw/ifpga_rawdev/base/ifpga_fme_dperf.c → drivers/raw/ifpga/base/ifpga_fme_dperf.c b/...s/raw/ifpga_rawdev/base/ifpga_fme_dperf.c → drivers/raw/ifpga/base/ifpga_fme_dperf.c
diff --git a/...s/raw/ifpga_rawdev/base/ifpga_fme_error.c → drivers/raw/ifpga/base/ifpga_fme_error.c b/...s/raw/ifpga_rawdev/base/ifpga_fme_error.c → drivers/raw/ifpga/base/ifpga_fme_error.c
diff --git a/...s/raw/ifpga_rawdev/base/ifpga_fme_iperf.c → drivers/raw/ifpga/base/ifpga_fme_iperf.c b/...s/raw/ifpga_rawdev/base/ifpga_fme_iperf.c → drivers/raw/ifpga/base/ifpga_fme_iperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c → drivers/raw/ifpga/base/ifpga_fme_pr.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c → drivers/raw/ifpga/base/ifpga_fme_pr.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h → drivers/raw/ifpga/base/ifpga_hw.h b/drivers/raw/ifpga_rawdev/base/ifpga_hw.h → drivers/raw/ifpga/base/ifpga_hw.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c → drivers/raw/ifpga/base/ifpga_port.c b/drivers/raw/ifpga_rawdev/base/ifpga_port.c → drivers/raw/ifpga/base/ifpga_port.c
diff --git a/.../raw/ifpga_rawdev/base/ifpga_port_error.c → drivers/raw/ifpga/base/ifpga_port_error.c b/.../raw/ifpga_rawdev/base/ifpga_port_error.c → drivers/raw/ifpga/base/ifpga_port_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/meson.build → drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build → drivers/raw/ifpga/base/meson.build
diff --git a/.../raw/ifpga_rawdev/base/opae_at24_eeprom.c → drivers/raw/ifpga/base/opae_at24_eeprom.c b/.../raw/ifpga_rawdev/base/opae_at24_eeprom.c → drivers/raw/ifpga/base/opae_at24_eeprom.c
diff --git a/.../raw/ifpga_rawdev/base/opae_at24_eeprom.h → drivers/raw/ifpga/base/opae_at24_eeprom.h b/.../raw/ifpga_rawdev/base/opae_at24_eeprom.h → drivers/raw/ifpga/base/opae_at24_eeprom.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.c → drivers/raw/ifpga/base/opae_debug.c b/drivers/raw/ifpga_rawdev/base/opae_debug.c → drivers/raw/ifpga/base/opae_debug.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.h → drivers/raw/ifpga/base/opae_debug.h b/drivers/raw/ifpga_rawdev/base/opae_debug.h → drivers/raw/ifpga/base/opae_debug.h
diff --git a/...rs/raw/ifpga_rawdev/base/opae_eth_group.c → drivers/raw/ifpga/base/opae_eth_group.c b/...rs/raw/ifpga_rawdev/base/opae_eth_group.c → drivers/raw/ifpga/base/opae_eth_group.c
diff --git a/...rs/raw/ifpga_rawdev/base/opae_eth_group.h → drivers/raw/ifpga/base/opae_eth_group.h b/...rs/raw/ifpga_rawdev/base/opae_eth_group.h → drivers/raw/ifpga/base/opae_eth_group.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c → drivers/raw/ifpga/base/opae_hw_api.c b/drivers/raw/ifpga_rawdev/base/opae_hw_api.c → drivers/raw/ifpga/base/opae_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h → drivers/raw/ifpga/base/opae_hw_api.h b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h → drivers/raw/ifpga/base/opae_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.c → drivers/raw/ifpga/base/opae_i2c.c b/drivers/raw/ifpga_rawdev/base/opae_i2c.c → drivers/raw/ifpga/base/opae_i2c.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.h → drivers/raw/ifpga/base/opae_i2c.h b/drivers/raw/ifpga_rawdev/base/opae_i2c.h → drivers/raw/ifpga/base/opae_i2c.h
diff --git a/...raw/ifpga_rawdev/base/opae_ifpga_hw_api.c → drivers/raw/ifpga/base/opae_ifpga_hw_api.c b/...raw/ifpga_rawdev/base/opae_ifpga_hw_api.c → drivers/raw/ifpga/base/opae_ifpga_hw_api.c
diff --git a/...raw/ifpga_rawdev/base/opae_ifpga_hw_api.h → drivers/raw/ifpga/base/opae_ifpga_hw_api.h b/...raw/ifpga_rawdev/base/opae_ifpga_hw_api.h → drivers/raw/ifpga/base/opae_ifpga_hw_api.h
diff --git a/.../raw/ifpga_rawdev/base/opae_intel_max10.c → drivers/raw/ifpga/base/opae_intel_max10.c b/.../raw/ifpga_rawdev/base/opae_intel_max10.c → drivers/raw/ifpga/base/opae_intel_max10.c
diff --git a/.../raw/ifpga_rawdev/base/opae_intel_max10.h → drivers/raw/ifpga/base/opae_intel_max10.h b/.../raw/ifpga_rawdev/base/opae_intel_max10.h → drivers/raw/ifpga/base/opae_intel_max10.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_osdep.h → drivers/raw/ifpga/base/opae_osdep.h b/drivers/raw/ifpga_rawdev/base/opae_osdep.h → drivers/raw/ifpga/base/opae_osdep.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.c → drivers/raw/ifpga/base/opae_spi.c b/drivers/raw/ifpga_rawdev/base/opae_spi.c → drivers/raw/ifpga/base/opae_spi.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.h → drivers/raw/ifpga/base/opae_spi.h b/drivers/raw/ifpga_rawdev/base/opae_spi.h → drivers/raw/ifpga/base/opae_spi.h
diff --git a/.../ifpga_rawdev/base/opae_spi_transaction.c → ...ers/raw/ifpga/base/opae_spi_transaction.c b/.../ifpga_rawdev/base/opae_spi_transaction.c → ...ers/raw/ifpga/base/opae_spi_transaction.c
diff --git a/...pga_rawdev/base/osdep_raw/osdep_generic.h → .../raw/ifpga/base/osdep_raw/osdep_generic.h b/...pga_rawdev/base/osdep_raw/osdep_generic.h → .../raw/ifpga/base/osdep_raw/osdep_generic.h
diff --git a/...pga_rawdev/base/osdep_rte/osdep_generic.h → .../raw/ifpga/base/osdep_rte/osdep_generic.h b/...pga_rawdev/base/osdep_rte/osdep_generic.h → .../raw/ifpga/base/osdep_rte/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c → drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c → drivers/raw/ifpga/ifpga_rawdev.c
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h → drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga_rawdev/ifpga_rawdev.h → drivers/raw/ifpga/ifpga_rawdev.h
diff --git a/drivers/raw/ifpga_rawdev/meson.build → drivers/raw/ifpga/meson.build b/drivers/raw/ifpga_rawdev/meson.build → drivers/raw/ifpga/meson.build
diff --git a/...a_rawdev/rte_pmd_ifpga_rawdev_version.map → drivers/raw/ifpga/rte_pmd_ifpga_version.map b/...a_rawdev/rte_pmd_ifpga_rawdev_version.map → drivers/raw/ifpga/rte_pmd_ifpga_version.map
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
@@ -2,9 +2,9 @@
 # Copyright 2018 NXP
 
 drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
-	'ifpga_rawdev', 'ioat', 'ntb',
+	'ifpga', 'ioat', 'ntb',
 	'octeontx2_dma',
-	'skeleton_rawdev']
+	'skeleton']
 std_deps = ['rawdev']
 config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
 driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/raw/skeleton_rawdev/Makefile → drivers/raw/skeleton/Makefile b/drivers/raw/skeleton_rawdev/Makefile → 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
 

diff --git a/drivers/raw/skeleton_rawdev/meson.build → drivers/raw/skeleton/meson.build b/drivers/raw/skeleton_rawdev/meson.build → drivers/raw/skeleton/meson.build
diff --git a/...awdev/rte_pmd_skeleton_rawdev_version.map → ...raw/skeleton/rte_pmd_skeleton_version.map b/...awdev/rte_pmd_skeleton_rawdev_version.map → ...raw/skeleton/rte_pmd_skeleton_version.map
diff --git a/...ers/raw/skeleton_rawdev/skeleton_rawdev.c → drivers/raw/skeleton/skeleton_rawdev.c b/...ers/raw/skeleton_rawdev/skeleton_rawdev.c → drivers/raw/skeleton/skeleton_rawdev.c
diff --git a/...ers/raw/skeleton_rawdev/skeleton_rawdev.h → drivers/raw/skeleton/skeleton_rawdev.h b/...ers/raw/skeleton_rawdev/skeleton_rawdev.h → drivers/raw/skeleton/skeleton_rawdev.h
diff --git a/...aw/skeleton_rawdev/skeleton_rawdev_test.c → drivers/raw/skeleton/skeleton_rawdev_test.c b/...aw/skeleton_rawdev/skeleton_rawdev_test.c → drivers/raw/skeleton/skeleton_rawdev_test.c