From f3aec9f070b7782590862bc58f1ad37c8793aed3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:57 +0100 Subject: [PATCH] ring: move to drivers/net/ Move ring PMD to drivers directory Signed-off-by: Bruce Richardson Acked-by: John McNamara Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/prog_guide/source_org.rst | 2 +- drivers/net/Makefile | 1 + {lib/librte_pmd_ring => drivers/net/ring}/Makefile | 0 {lib/librte_pmd_ring => drivers/net/ring}/rte_eth_ring.c | 0 {lib/librte_pmd_ring => drivers/net/ring}/rte_eth_ring.h | 0 .../net/ring}/rte_eth_ring_version.map | 0 lib/Makefile | 1 - lib/librte_eal/bsdapp/eal/Makefile | 2 +- lib/librte_eal/linuxapp/eal/Makefile | 2 +- 10 files changed, 5 insertions(+), 5 deletions(-) rename {lib/librte_pmd_ring => drivers/net/ring}/Makefile (100%) rename {lib/librte_pmd_ring => drivers/net/ring}/rte_eth_ring.c (100%) rename {lib/librte_pmd_ring => drivers/net/ring}/rte_eth_ring.h (100%) rename {lib/librte_pmd_ring => drivers/net/ring}/rte_eth_ring_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 64ccca54d8..c2557bd648 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -261,7 +261,7 @@ F: doc/guides/nics/pcap_ring.rst Ring PMD M: Bruce Richardson -F: lib/librte_pmd_ring/ +F: drivers/net/ring/ F: doc/guides/nics/pcap_ring.rst F: app/test/test_pmd_ring.c diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index f4632348bc..6e51bf7b4d 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -79,7 +79,6 @@ The lib directory contains:: +-- librte_mempool # memory pool manager (fixedsized objects) +-- librte_meter # QoS metering library +-- librte_net # various IP-related headers - +-- librte_pmd_ring # ring poll mode driver +-- librte_pmd_virtio # virtio poll mode driver +-- librte_pmd_vmxnet3 # VMXNET3 poll mode driver +-- librte_pmd_xenvirt # Xen virtio poll mode driver @@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains:: +-- mlx4 # Mellanox ConnectX-3 poll mode driver +-- null # NULL poll mode driver for testing +-- pcap # PCAP poll mode driver + +-- ring # ring poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 29c936125f..f641f0a633 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -41,6 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap +DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_ring/Makefile b/drivers/net/ring/Makefile similarity index 100% rename from lib/librte_pmd_ring/Makefile rename to drivers/net/ring/Makefile diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c similarity index 100% rename from lib/librte_pmd_ring/rte_eth_ring.c rename to drivers/net/ring/rte_eth_ring.c diff --git a/lib/librte_pmd_ring/rte_eth_ring.h b/drivers/net/ring/rte_eth_ring.h similarity index 100% rename from lib/librte_pmd_ring/rte_eth_ring.h rename to drivers/net/ring/rte_eth_ring.h diff --git a/lib/librte_pmd_ring/rte_eth_ring_version.map b/drivers/net/ring/rte_eth_ring_version.map similarity index 100% rename from lib/librte_pmd_ring/rte_eth_ring_version.map rename to drivers/net/ring/rte_eth_ring_version.map diff --git a/lib/Makefile b/lib/Makefile index e63f1fe2b4..0bb87ba767 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,7 +41,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether -DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index c2fe933b19..3d1d9eb076 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -42,7 +42,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_ring CFLAGS += -I$(RTE_SDK)/lib/librte_mempool CFLAGS += -I$(RTE_SDK)/lib/librte_malloc CFLAGS += -I$(RTE_SDK)/lib/librte_ether -CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring +CFLAGS += -I$(RTE_SDK)/drivers/net/ring CFLAGS += -I$(RTE_SDK)/drivers/net/pcap CFLAGS += $(WERROR_FLAGS) -O3 diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index fdb365650f..bc1e90d419 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -47,7 +47,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_mempool CFLAGS += -I$(RTE_SDK)/lib/librte_malloc CFLAGS += -I$(RTE_SDK)/lib/librte_ether CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem -CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring +CFLAGS += -I$(RTE_SDK)/drivers/net/ring CFLAGS += -I$(RTE_SDK)/drivers/net/pcap CFLAGS += -I$(RTE_SDK)/drivers/net/af_packet CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_xenvirt -- 2.20.1