From d15fcf76c8b76e12c4050609cd31927ee0864c5a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:49 +0100 Subject: [PATCH] e1000: move to drivers/net/ Move e1000 pmd to drivers/net directory As part of move, rename "e1000" subdirectory, which contains the code from the "base driver", 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 + {lib/librte_pmd_e1000 => drivers/net/e1000}/Makefile | 6 +++--- .../e1000 => drivers/net/e1000/base}/README | 0 .../e1000 => drivers/net/e1000/base}/e1000_80003es2lan.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_80003es2lan.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_82540.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82541.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82541.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_82542.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82543.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82543.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_82571.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82571.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_82575.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_82575.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_api.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_api.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_defines.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_hw.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_i210.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_i210.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_ich8lan.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_ich8lan.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_mac.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_mac.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_manage.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_manage.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_mbx.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_mbx.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_nvm.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_nvm.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_osdep.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_osdep.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_phy.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_phy.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_regs.h | 0 .../e1000 => drivers/net/e1000/base}/e1000_vf.c | 0 .../e1000 => drivers/net/e1000/base}/e1000_vf.h | 0 .../librte_pmd_e1000 => drivers/net/e1000}/e1000_ethdev.h | 0 {lib/librte_pmd_e1000 => drivers/net/e1000}/e1000_logs.h | 0 {lib/librte_pmd_e1000 => drivers/net/e1000}/em_ethdev.c | 4 ++-- {lib/librte_pmd_e1000 => drivers/net/e1000}/em_rxtx.c | 6 +++--- {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_ethdev.c | 4 ++-- {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_pf.c | 8 ++++---- {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_rxtx.c | 4 ++-- .../net/e1000}/rte_pmd_e1000_version.map | 0 lib/Makefile | 1 - 49 files changed, 19 insertions(+), 19 deletions(-) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/Makefile (97%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/README (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_80003es2lan.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_80003es2lan.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82540.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82541.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82541.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82542.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82543.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82543.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82571.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82571.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82575.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_82575.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_api.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_api.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_defines.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_hw.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_i210.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_i210.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_ich8lan.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_ich8lan.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_mac.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_mac.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_manage.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_manage.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_mbx.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_mbx.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_nvm.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_nvm.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_osdep.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_osdep.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_phy.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_phy.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_regs.h (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_vf.c (100%) rename {lib/librte_pmd_e1000/e1000 => drivers/net/e1000/base}/e1000_vf.h (100%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/e1000_ethdev.h (100%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/e1000_logs.h (100%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/em_ethdev.c (99%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/em_rxtx.c (99%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_ethdev.c (99%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_pf.c (98%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/igb_rxtx.c (99%) rename {lib/librte_pmd_e1000 => drivers/net/e1000}/rte_pmd_e1000_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4162aec053..47f73f6618 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -214,7 +214,7 @@ Cisco enic F: lib/librte_pmd_enic/ Intel e1000 -F: lib/librte_pmd_e1000/ +F: drivers/net/e1000/ F: doc/guides/nics/e1000em.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 c0bf70edd6..41ff7470cb 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_e1000 # 1GbE poll mode drivers (igb and em) +-- librte_pmd_fm10k # Host interface PMD driver for FM10000 Series +-- librte_pmd_ixgbe # 10GbE poll mode driver +-- librte_pmd_i40e # 40GbE poll mode driver @@ -107,6 +106,7 @@ The drivers directory has a net subdirectory which contains:: drivers/net +-- af_packet # poll mode driver based on linux af_packet +-- bonding # bonding poll mode driver + +-- e1000 # 1GbE poll mode drivers (igb and em) Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4b2568b78b..39e577c7cc 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -33,6 +33,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding +DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_e1000/Makefile b/drivers/net/e1000/Makefile similarity index 97% rename from lib/librte_pmd_e1000/Makefile rename to drivers/net/e1000/Makefile index 158bc81db9..3d525faa60 100644 --- a/lib/librte_pmd_e1000/Makefile +++ b/drivers/net/e1000/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 @@ -60,10 +60,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)/e1000/*.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)/e1000 +VPATH += $(SRCDIR)/base # # all source are stored in SRCS-y diff --git a/lib/librte_pmd_e1000/e1000/README b/drivers/net/e1000/base/README similarity index 100% rename from lib/librte_pmd_e1000/e1000/README rename to drivers/net/e1000/base/README diff --git a/lib/librte_pmd_e1000/e1000/e1000_80003es2lan.c b/drivers/net/e1000/base/e1000_80003es2lan.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_80003es2lan.c rename to drivers/net/e1000/base/e1000_80003es2lan.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_80003es2lan.h b/drivers/net/e1000/base/e1000_80003es2lan.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_80003es2lan.h rename to drivers/net/e1000/base/e1000_80003es2lan.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_82540.c b/drivers/net/e1000/base/e1000_82540.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82540.c rename to drivers/net/e1000/base/e1000_82540.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82541.c b/drivers/net/e1000/base/e1000_82541.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82541.c rename to drivers/net/e1000/base/e1000_82541.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82541.h b/drivers/net/e1000/base/e1000_82541.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82541.h rename to drivers/net/e1000/base/e1000_82541.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_82542.c b/drivers/net/e1000/base/e1000_82542.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82542.c rename to drivers/net/e1000/base/e1000_82542.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82543.c b/drivers/net/e1000/base/e1000_82543.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82543.c rename to drivers/net/e1000/base/e1000_82543.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82543.h b/drivers/net/e1000/base/e1000_82543.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82543.h rename to drivers/net/e1000/base/e1000_82543.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_82571.c b/drivers/net/e1000/base/e1000_82571.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82571.c rename to drivers/net/e1000/base/e1000_82571.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82571.h b/drivers/net/e1000/base/e1000_82571.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82571.h rename to drivers/net/e1000/base/e1000_82571.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82575.c rename to drivers/net/e1000/base/e1000_82575.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_82575.h b/drivers/net/e1000/base/e1000_82575.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_82575.h rename to drivers/net/e1000/base/e1000_82575.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_api.c b/drivers/net/e1000/base/e1000_api.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_api.c rename to drivers/net/e1000/base/e1000_api.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_api.h b/drivers/net/e1000/base/e1000_api.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_api.h rename to drivers/net/e1000/base/e1000_api.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_defines.h rename to drivers/net/e1000/base/e1000_defines.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_hw.h b/drivers/net/e1000/base/e1000_hw.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_hw.h rename to drivers/net/e1000/base/e1000_hw.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_i210.c rename to drivers/net/e1000/base/e1000_i210.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_i210.h b/drivers/net/e1000/base/e1000_i210.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_i210.h rename to drivers/net/e1000/base/e1000_i210.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_ich8lan.c rename to drivers/net/e1000/base/e1000_ich8lan.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_ich8lan.h b/drivers/net/e1000/base/e1000_ich8lan.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_ich8lan.h rename to drivers/net/e1000/base/e1000_ich8lan.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_mac.c rename to drivers/net/e1000/base/e1000_mac.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_mac.h b/drivers/net/e1000/base/e1000_mac.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_mac.h rename to drivers/net/e1000/base/e1000_mac.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_manage.c b/drivers/net/e1000/base/e1000_manage.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_manage.c rename to drivers/net/e1000/base/e1000_manage.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_manage.h b/drivers/net/e1000/base/e1000_manage.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_manage.h rename to drivers/net/e1000/base/e1000_manage.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_mbx.c b/drivers/net/e1000/base/e1000_mbx.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_mbx.c rename to drivers/net/e1000/base/e1000_mbx.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_mbx.h b/drivers/net/e1000/base/e1000_mbx.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_mbx.h rename to drivers/net/e1000/base/e1000_mbx.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_nvm.c rename to drivers/net/e1000/base/e1000_nvm.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_nvm.h b/drivers/net/e1000/base/e1000_nvm.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_nvm.h rename to drivers/net/e1000/base/e1000_nvm.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.c b/drivers/net/e1000/base/e1000_osdep.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_osdep.c rename to drivers/net/e1000/base/e1000_osdep.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.h b/drivers/net/e1000/base/e1000_osdep.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_osdep.h rename to drivers/net/e1000/base/e1000_osdep.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_phy.c rename to drivers/net/e1000/base/e1000_phy.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_phy.h b/drivers/net/e1000/base/e1000_phy.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_phy.h rename to drivers/net/e1000/base/e1000_phy.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_regs.h b/drivers/net/e1000/base/e1000_regs.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_regs.h rename to drivers/net/e1000/base/e1000_regs.h diff --git a/lib/librte_pmd_e1000/e1000/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_vf.c rename to drivers/net/e1000/base/e1000_vf.c diff --git a/lib/librte_pmd_e1000/e1000/e1000_vf.h b/drivers/net/e1000/base/e1000_vf.h similarity index 100% rename from lib/librte_pmd_e1000/e1000/e1000_vf.h rename to drivers/net/e1000/base/e1000_vf.h diff --git a/lib/librte_pmd_e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h similarity index 100% rename from lib/librte_pmd_e1000/e1000_ethdev.h rename to drivers/net/e1000/e1000_ethdev.h diff --git a/lib/librte_pmd_e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h similarity index 100% rename from lib/librte_pmd_e1000/e1000_logs.h rename to drivers/net/e1000/e1000_logs.h diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c similarity index 99% rename from lib/librte_pmd_e1000/em_ethdev.c rename to drivers/net/e1000/em_ethdev.c index da02988d3e..d28030edbd 100644 --- a/lib/librte_pmd_e1000/em_ethdev.c +++ b/drivers/net/e1000/em_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 @@ -53,7 +53,7 @@ #include #include "e1000_logs.h" -#include "e1000/e1000_api.h" +#include "base/e1000_api.h" #include "e1000_ethdev.h" #define EM_EIAC 0x000DC diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c similarity index 99% rename from lib/librte_pmd_e1000/em_rxtx.c rename to drivers/net/e1000/em_rxtx.c index 64d067c0a5..3a79e8b657 100644 --- a/lib/librte_pmd_e1000/em_rxtx.c +++ b/drivers/net/e1000/em_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. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,9 +70,9 @@ #include #include "e1000_logs.h" -#include "e1000/e1000_api.h" +#include "base/e1000_api.h" #include "e1000_ethdev.h" -#include "e1000/e1000_osdep.h" +#include "base/e1000_osdep.h" #define E1000_TXD_VLAN_SHIFT 16 diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c similarity index 99% rename from lib/librte_pmd_e1000/igb_ethdev.c rename to drivers/net/e1000/igb_ethdev.c index 4415155c02..e4b370d928 100644 --- a/lib/librte_pmd_e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_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 @@ -53,7 +53,7 @@ #include #include "e1000_logs.h" -#include "e1000/e1000_api.h" +#include "base/e1000_api.h" #include "e1000_ethdev.h" /* diff --git a/lib/librte_pmd_e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c similarity index 98% rename from lib/librte_pmd_e1000/igb_pf.c rename to drivers/net/e1000/igb_pf.c index 2d49379c9e..6a4d210fad 100644 --- a/lib/librte_pmd_e1000/igb_pf.c +++ b/drivers/net/e1000/igb_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,9 +49,9 @@ #include #include -#include "e1000/e1000_defines.h" -#include "e1000/e1000_regs.h" -#include "e1000/e1000_hw.h" +#include "base/e1000_defines.h" +#include "base/e1000_regs.h" +#include "base/e1000_hw.h" #include "e1000_ethdev.h" static inline uint16_t diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c similarity index 99% rename from lib/librte_pmd_e1000/igb_rxtx.c rename to drivers/net/e1000/igb_rxtx.c index 80d05c06a7..f586311602 100644 --- a/lib/librte_pmd_e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_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. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ #include #include "e1000_logs.h" -#include "e1000/e1000_api.h" +#include "base/e1000_api.h" #include "e1000_ethdev.h" /* Bit Mask to indicate what bits required for building TX context */ diff --git a/lib/librte_pmd_e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map similarity index 100% rename from lib/librte_pmd_e1000/rte_pmd_e1000_version.map rename to drivers/net/e1000/rte_pmd_e1000_version.map diff --git a/lib/Makefile b/lib/Makefile index 889a20d86c..3350e999bf 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_E1000_PMD) += librte_pmd_e1000 DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += librte_pmd_fm10k -- 2.20.1