From abf7275bbaa2918a387e1f28f2c352053279c879 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:53 +0100 Subject: [PATCH] ixgbe: move to drivers/net/ move ixgbe PMD to drivers/net directory. As part of the move, we rename the ixgbe directory, containing the ixgbe "base driver" code, from "ixgbe" to "base". 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 + .../net/ixgbe}/Makefile | 6 +++--- .../ixgbe => drivers/net/ixgbe/base}/README | 0 .../net/ixgbe/base}/ixgbe_82598.c | 0 .../net/ixgbe/base}/ixgbe_82598.h | 0 .../net/ixgbe/base}/ixgbe_82599.c | 0 .../net/ixgbe/base}/ixgbe_82599.h | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_api.c | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_api.h | 0 .../net/ixgbe/base}/ixgbe_common.c | 0 .../net/ixgbe/base}/ixgbe_common.h | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb.c | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb.h | 0 .../net/ixgbe/base}/ixgbe_dcb_82598.c | 0 .../net/ixgbe/base}/ixgbe_dcb_82598.h | 0 .../net/ixgbe/base}/ixgbe_dcb_82599.c | 0 .../net/ixgbe/base}/ixgbe_dcb_82599.h | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_mbx.c | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_mbx.h | 0 .../net/ixgbe/base}/ixgbe_osdep.h | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_phy.c | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_phy.h | 0 .../net/ixgbe/base}/ixgbe_type.h | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_vf.c | 0 .../ixgbe => drivers/net/ixgbe/base}/ixgbe_vf.h | 0 .../net/ixgbe/base}/ixgbe_x540.c | 0 .../net/ixgbe/base}/ixgbe_x540.h | 0 .../net/ixgbe/base}/ixgbe_x550.c | 0 .../net/ixgbe/base}/ixgbe_x550.h | 0 .../net/ixgbe}/ixgbe_82599_bypass.c | 12 ++++++------ .../net/ixgbe}/ixgbe_bypass.c | 0 .../net/ixgbe}/ixgbe_bypass.h | 0 .../net/ixgbe}/ixgbe_bypass_api.h | 0 .../net/ixgbe}/ixgbe_bypass_defines.h | 0 .../net/ixgbe}/ixgbe_ethdev.c | 16 ++++++++-------- .../net/ixgbe}/ixgbe_ethdev.h | 8 ++++---- .../net/ixgbe}/ixgbe_fdir.c | 16 ++++++++-------- .../net/ixgbe}/ixgbe_logs.h | 0 .../net/ixgbe}/ixgbe_pf.c | 4 ++-- .../net/ixgbe}/ixgbe_rxtx.c | 10 +++++----- .../net/ixgbe}/ixgbe_rxtx.h | 0 .../net/ixgbe}/ixgbe_rxtx_vec.c | 0 .../net/ixgbe}/rte_pmd_ixgbe_version.map | 0 lib/Makefile | 1 - 46 files changed, 39 insertions(+), 39 deletions(-) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/Makefile (97%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/README (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_82598.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_82598.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_82599.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_82599.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_api.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_api.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_common.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_common.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb_82598.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb_82598.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb_82599.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_dcb_82599.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_mbx.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_mbx.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_osdep.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_phy.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_phy.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_type.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_vf.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_vf.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_x540.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_x540.h (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_x550.c (100%) rename {lib/librte_pmd_ixgbe/ixgbe => drivers/net/ixgbe/base}/ixgbe_x550.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_82599_bypass.c (97%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_bypass.c (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_bypass.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_bypass_api.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_bypass_defines.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_ethdev.c (99%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_ethdev.h (98%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_fdir.c (98%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_logs.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_pf.c (99%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_rxtx.c (99%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_rxtx.h (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/ixgbe_rxtx_vec.c (100%) rename {lib/librte_pmd_ixgbe => drivers/net/ixgbe}/rte_pmd_ixgbe_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 3ab5e3af50..767eab5028 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,7 +221,7 @@ F: doc/guides/nics/intel_vf.rst Intel ixgbe M: Helin Zhang M: Konstantin Ananyev -F: lib/librte_pmd_ixgbe/ +F: drivers/net/ixgbe/ F: doc/guides/nics/ixgbe.rst F: doc/guides/nics/intel_vf.rst diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 53077b3611..8e3f4ee159 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_ixgbe # 10GbE poll mode driver +-- librte_pmd_mlx4 # Mellanox ConnectX-3 poll mode driver +-- librte_pmd_pcap # PCAP poll mode driver +-- librte_pmd_ring # ring poll mode driver @@ -108,6 +107,7 @@ The drivers directory has a net subdirectory which contains:: +-- enic # Cisco VIC Ethernet NIC Poll-mode Driver +-- fm10k # Host interface PMD driver for FM10000 Series +-- i40e # 40GbE poll mode driver + +-- ixgbe # 10GbE poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 7418c1db4c..156a16fabb 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -37,6 +37,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e +DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_ixgbe/Makefile b/drivers/net/ixgbe/Makefile similarity index 97% rename from lib/librte_pmd_ixgbe/Makefile rename to drivers/net/ixgbe/Makefile index e0f89168b8..f92a565f0d 100644 --- a/lib/librte_pmd_ixgbe/Makefile +++ b/drivers/net/ixgbe/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -82,10 +82,10 @@ endif # Add extra flags for base driver files (also known as shared code) # to disable warnings in them # -BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/ixgbe/*.c))) +BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) $(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) -VPATH += $(SRCDIR)/ixgbe +VPATH += $(SRCDIR)/base # # all source are stored in SRCS-y diff --git a/lib/librte_pmd_ixgbe/ixgbe/README b/drivers/net/ixgbe/base/README similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/README rename to drivers/net/ixgbe/base/README diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/base/ixgbe_82598.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_82598.c rename to drivers/net/ixgbe/base/ixgbe_82598.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82598.h b/drivers/net/ixgbe/base/ixgbe_82598.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_82598.h rename to drivers/net/ixgbe/base/ixgbe_82598.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c rename to drivers/net/ixgbe/base/ixgbe_82599.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.h b/drivers/net/ixgbe/base/ixgbe_82599.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.h rename to drivers/net/ixgbe/base/ixgbe_82599.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_api.c b/drivers/net/ixgbe/base/ixgbe_api.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_api.c rename to drivers/net/ixgbe/base/ixgbe_api.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_api.h b/drivers/net/ixgbe/base/ixgbe_api.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_api.h rename to drivers/net/ixgbe/base/ixgbe_api.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_common.c rename to drivers/net/ixgbe/base/ixgbe_common.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/base/ixgbe_common.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_common.h rename to drivers/net/ixgbe/base/ixgbe_common.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/base/ixgbe_dcb.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb.c rename to drivers/net/ixgbe/base/ixgbe_dcb.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/base/ixgbe_dcb.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb.h rename to drivers/net/ixgbe/base/ixgbe_dcb.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82598.c rename to drivers/net/ixgbe/base/ixgbe_dcb_82598.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/base/ixgbe_dcb_82598.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82598.h rename to drivers/net/ixgbe/base/ixgbe_dcb_82598.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82599.c rename to drivers/net/ixgbe/base/ixgbe_dcb_82599.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/base/ixgbe_dcb_82599.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_dcb_82599.h rename to drivers/net/ixgbe/base/ixgbe_dcb_82599.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/base/ixgbe_mbx.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_mbx.c rename to drivers/net/ixgbe/base/ixgbe_mbx.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/base/ixgbe_mbx.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_mbx.h rename to drivers/net/ixgbe/base/ixgbe_mbx.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_osdep.h rename to drivers/net/ixgbe/base/ixgbe_osdep.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.c rename to drivers/net/ixgbe/base/ixgbe_phy.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_phy.h rename to drivers/net/ixgbe/base/ixgbe_phy.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h rename to drivers/net/ixgbe/base/ixgbe_type.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c rename to drivers/net/ixgbe/base/ixgbe_vf.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h b/drivers/net/ixgbe/base/ixgbe_vf.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h rename to drivers/net/ixgbe/base/ixgbe_vf.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/base/ixgbe_x540.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.c rename to drivers/net/ixgbe/base/ixgbe_x540.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.h b/drivers/net/ixgbe/base/ixgbe_x540.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_x540.h rename to drivers/net/ixgbe/base/ixgbe_x540.h diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.c rename to drivers/net/ixgbe/base/ixgbe_x550.c diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.h b/drivers/net/ixgbe/base/ixgbe_x550.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe/ixgbe_x550.h rename to drivers/net/ixgbe/base/ixgbe_x550.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c b/drivers/net/ixgbe/ixgbe_82599_bypass.c similarity index 97% rename from lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c rename to drivers/net/ixgbe/ixgbe_82599_bypass.c index 12cc01d5f8..76d75fb922 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c +++ b/drivers/net/ixgbe/ixgbe_82599_bypass.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,11 +31,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "ixgbe/ixgbe_type.h" -#include "ixgbe/ixgbe_82599.h" -#include "ixgbe/ixgbe_api.h" -#include "ixgbe/ixgbe_common.h" -#include "ixgbe/ixgbe_phy.h" +#include "base/ixgbe_type.h" +#include "base/ixgbe_82599.h" +#include "base/ixgbe_api.h" +#include "base/ixgbe_common.h" +#include "base/ixgbe_phy.h" #include "ixgbe_bypass_defines.h" #include "ixgbe_bypass.h" diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c b/drivers/net/ixgbe/ixgbe_bypass.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_bypass.c rename to drivers/net/ixgbe/ixgbe_bypass.c diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.h b/drivers/net/ixgbe/ixgbe_bypass.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_bypass.h rename to drivers/net/ixgbe/ixgbe_bypass.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass_api.h b/drivers/net/ixgbe/ixgbe_bypass_api.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_bypass_api.h rename to drivers/net/ixgbe/ixgbe_bypass_api.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h b/drivers/net/ixgbe/ixgbe_bypass_defines.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h rename to drivers/net/ixgbe/ixgbe_bypass_defines.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c similarity index 99% rename from lib/librte_pmd_ixgbe/ixgbe_ethdev.c rename to drivers/net/ixgbe/ixgbe_ethdev.c index 5f9a1cfa9c..0d9f9b27ba 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,9 +62,9 @@ #include #include "ixgbe_logs.h" -#include "ixgbe/ixgbe_api.h" -#include "ixgbe/ixgbe_vf.h" -#include "ixgbe/ixgbe_common.h" +#include "base/ixgbe_api.h" +#include "base/ixgbe_vf.h" +#include "base/ixgbe_common.h" #include "ixgbe_ethdev.h" #include "ixgbe_bypass.h" #include "ixgbe_rxtx.h" @@ -461,7 +461,7 @@ rte_ixgbe_dev_atomic_write_link_status(struct rte_eth_dev *dev, } /* - * This function is the same as ixgbe_is_sfp() in ixgbe/ixgbe.h. + * This function is the same as ixgbe_is_sfp() in base/ixgbe.h. */ static inline int ixgbe_is_sfp(struct ixgbe_hw *hw) @@ -509,7 +509,7 @@ ixgbe_enable_intr(struct rte_eth_dev *dev) } /* - * This function is based on ixgbe_disable_intr() in ixgbe/ixgbe.h. + * This function is based on ixgbe_disable_intr() in base/ixgbe.h. */ static void ixgbe_disable_intr(struct ixgbe_hw *hw) @@ -710,7 +710,7 @@ ixgbe_swfw_lock_reset(struct ixgbe_hw *hw) } /* - * This function is based on code in ixgbe_attach() in ixgbe/ixgbe.c. + * This function is based on code in ixgbe_attach() in base/ixgbe.c. * It returns 0 on success. */ static int @@ -1740,7 +1740,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev) } /* - * This function is based on ixgbe_update_stats_counters() in ixgbe/ixgbe.c + * This function is based on ixgbe_update_stats_counters() in base/ixgbe.c */ static void ixgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h similarity index 98% rename from lib/librte_pmd_ixgbe/ixgbe_ethdev.h rename to drivers/net/ixgbe/ixgbe_ethdev.h index 419ea5db4b..19237b8f2d 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,9 +33,9 @@ #ifndef _IXGBE_ETHDEV_H_ #define _IXGBE_ETHDEV_H_ -#include "ixgbe/ixgbe_dcb.h" -#include "ixgbe/ixgbe_dcb_82599.h" -#include "ixgbe/ixgbe_dcb_82598.h" +#include "base/ixgbe_dcb.h" +#include "base/ixgbe_dcb_82599.h" +#include "base/ixgbe_dcb_82598.h" #include "ixgbe_bypass.h" /* need update link, bit flag */ diff --git a/lib/librte_pmd_ixgbe/ixgbe_fdir.c b/drivers/net/ixgbe/ixgbe_fdir.c similarity index 98% rename from lib/librte_pmd_ixgbe/ixgbe_fdir.c rename to drivers/net/ixgbe/ixgbe_fdir.c index afc53cb83d..db48817049 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_fdir.c +++ b/drivers/net/ixgbe/ixgbe_fdir.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,8 +45,8 @@ #include #include "ixgbe_logs.h" -#include "ixgbe/ixgbe_api.h" -#include "ixgbe/ixgbe_common.h" +#include "base/ixgbe_api.h" +#include "base/ixgbe_common.h" #include "ixgbe_ethdev.h" /* To get PBALLOC (Packet Buffer Allocation) bits from FDIRCTRL value */ @@ -137,7 +137,7 @@ static void ixgbe_fdir_stats_get(struct rte_eth_dev *dev, struct rte_eth_fdir_stats *fdir_stats); /** - * This function is based on ixgbe_fdir_enable_82599() in ixgbe/ixgbe_82599.c. + * This function is based on ixgbe_fdir_enable_82599() in base/ixgbe_82599.c. * It adds extra configuration of fdirctrl that is common for all filter types. * * Initialize Flow Director control registers @@ -281,7 +281,7 @@ reverse_fdir_bitmasks(uint16_t hi_dword, uint16_t lo_dword) } /* - * This is based on ixgbe_fdir_set_input_mask_82599() in ixgbe/ixgbe_82599.c, + * This is based on ixgbe_fdir_set_input_mask_82599() in base/ixgbe_82599.c, * but makes use of the rte_fdir_masks structure to see which bits to set. */ static int @@ -743,7 +743,7 @@ atr_compute_sig_hash_82599(union ixgbe_atr_input *input, /* * This is based on ixgbe_fdir_write_perfect_filter_82599() in - * ixgbe/ixgbe_82599.c, with the ability to set extra flags in FDIRCMD register + * base/ixgbe_82599.c, with the ability to set extra flags in FDIRCMD register * added, and IPv6 support also added. The hash value is also pre-calculated * as the pballoc value is needed to do it. */ @@ -800,7 +800,7 @@ fdir_write_perfect_filter_82599(struct ixgbe_hw *hw, /** * This function is based on ixgbe_atr_add_signature_filter_82599() in - * ixgbe/ixgbe_82599.c, but uses a pre-calculated hash value. It also supports + * base/ixgbe_82599.c, but uses a pre-calculated hash value. It also supports * setting extra fields in the FDIRCMD register, and removes the code that was * verifying the flow_type field. According to the documentation, a flow type of * 00 (i.e. not TCP, UDP, or SCTP) is not supported, however it appears to @@ -842,7 +842,7 @@ fdir_add_signature_filter_82599(struct ixgbe_hw *hw, /* * This is based on ixgbe_fdir_erase_perfect_filter_82599() in - * ixgbe/ixgbe_82599.c. It is modified to take in the hash as a parameter so + * base/ixgbe_82599.c. It is modified to take in the hash as a parameter so * that it can be used for removing signature and perfect filters. */ static int diff --git a/lib/librte_pmd_ixgbe/ixgbe_logs.h b/drivers/net/ixgbe/ixgbe_logs.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_logs.h rename to drivers/net/ixgbe/ixgbe_logs.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c similarity index 99% rename from lib/librte_pmd_ixgbe/ixgbe_pf.c rename to drivers/net/ixgbe/ixgbe_pf.c index dbda9b5ac7..caed137733 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_pf.c +++ b/drivers/net/ixgbe/ixgbe_pf.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ #include #include -#include "ixgbe/ixgbe_common.h" +#include "base/ixgbe_common.h" #include "ixgbe_ethdev.h" #define IXGBE_MAX_VFTA (128) diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c similarity index 99% rename from lib/librte_pmd_ixgbe/ixgbe_rxtx.c rename to drivers/net/ixgbe/ixgbe_rxtx.c index 57c9430e72..4f9ab22c57 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * Copyright 2014 6WIND S.A. * All rights reserved. * @@ -73,11 +73,11 @@ #include #include "ixgbe_logs.h" -#include "ixgbe/ixgbe_api.h" -#include "ixgbe/ixgbe_vf.h" +#include "base/ixgbe_api.h" +#include "base/ixgbe_vf.h" #include "ixgbe_ethdev.h" -#include "ixgbe/ixgbe_dcb.h" -#include "ixgbe/ixgbe_common.h" +#include "base/ixgbe_dcb.h" +#include "base/ixgbe_common.h" #include "ixgbe_rxtx.h" /* Bit Mask to indicate what bits required for building TX context */ diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_rxtx.h rename to drivers/net/ixgbe/ixgbe_rxtx.h diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c b/drivers/net/ixgbe/ixgbe_rxtx_vec.c similarity index 100% rename from lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c rename to drivers/net/ixgbe/ixgbe_rxtx_vec.c diff --git a/lib/librte_pmd_ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map similarity index 100% rename from lib/librte_pmd_ixgbe/rte_pmd_ixgbe_version.map rename to drivers/net/ixgbe/rte_pmd_ixgbe_version.map diff --git a/lib/Makefile b/lib/Makefile index 73e0bd125b..ffd7870f55 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_IXGBE_PMD) += librte_pmd_ixgbe DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += librte_pmd_mlx4 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap