From: Pawel Wodkowski Date: Wed, 11 Jun 2014 07:20:37 +0000 (+0100) Subject: pci: remove conditions on device definitions X-Git-Tag: spdx-start~10754 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;ds=sidebyside;h=cc333208d5658fea642098b665cd429e6cda54a9;p=dpdk.git pci: remove conditions on device definitions This patch removes obsolete code that prevents defining NICs 82575EB, I218 and I350. Signed-off-by: Pawel Wodkowski [Thomas: remove conditions for I218] Signed-off-by: Thomas Monjalon --- diff --git a/app/test/test_pci.c b/app/test/test_pci.c index 21428a90f2..680a095670 100644 --- a/app/test/test_pci.c +++ b/app/test/test_pci.c @@ -81,7 +81,6 @@ struct rte_pci_id my_driver_id2[] = { /* IGB & EM NICS */ #define RTE_PCI_DEV_ID_DECL_EM(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, #define RTE_PCI_DEV_ID_DECL_IGB(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, -#define RTE_PCI_DEV_USE_82575EB_COPPER #include { .vendor_id = 0, /* sentinel */ }, diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h index ee7f651400..9c1ee042ad 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -232,14 +232,10 @@ #define E1000_DEV_ID_PCH_LPT_I217_V 0x153B #define E1000_DEV_ID_PCH_LPTLP_I218_LM 0x155A #define E1000_DEV_ID_PCH_LPTLP_I218_V 0x1559 -#ifdef NAHUM6_LPTH_I218_HW #define E1000_DEV_ID_PCH_I218_LM2 0x15A0 #define E1000_DEV_ID_PCH_I218_V2 0x15A1 -#endif /* NAHUM6_LPTH_I218_HW */ -#ifdef NAHUM6_WPT_HW #define E1000_DEV_ID_PCH_I218_LM3 0x15A2 /* Wildcat Point PCH */ #define E1000_DEV_ID_PCH_I218_V3 0x15A3 /* Wildcat Point PCH */ -#endif /* NAHUM6_WPT_HW */ /* * Tested (supported) on VM emulated HW. @@ -323,11 +319,7 @@ RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82576_NS) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82576_NS_SERDES) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82576_SERDES_QUAD) -/* This device is the on-board NIC on some development boards. */ -#ifdef RTE_PCI_DEV_USE_82575EB_COPPER RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82575EB_COPPER) -#endif - RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER) @@ -338,11 +330,7 @@ RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82580_SGMII) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82580_COPPER_DUAL) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_82580_QUAD_FIBER) -/* This device is the on-board NIC on some development boards. */ -#ifndef RTE_PCI_DEV_NO_USE_I350_COPPER RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_I350_COPPER) -#endif - RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_I350_FIBER) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_I350_SERDES) RTE_PCI_DEV_ID_DECL_IGB(PCI_VENDOR_ID_INTEL, E1000_DEV_ID_I350_SGMII)