From: Intel <intel.com>
Date: Wed, 19 Dec 2012 23:00:00 +0000 (+0100)
Subject: app: update test pci device ids
X-Git-Tag: spdx-start~11328
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=ce0ce98e9f1b76411d24df40b2399c8e5b5b93df;p=dpdk.git

app: update test pci device ids

Signed-off-by: Intel
---

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index a26d1ff773..78996f5b04 100644
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -44,7 +44,6 @@
 
 #include "test.h"
 
-#define RTE_PCI_DEV_ID_DECL(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
 
 #define	TEST_BLACKLIST_NUM	0x100
 
@@ -72,24 +71,20 @@ static int my_driver_init(struct rte_pci_driver *dr,
  * drivers are created (one with IGB devices, the other with IXGBE devices).
  */
 
-/* IXGBE NICS + e1000 used for Qemu */
-#define RTE_LIBRTE_IXGBE_PMD 1
-#undef RTE_LIBRTE_IGB_PMD
+/* IXGBE NICS */
 struct rte_pci_id my_driver_id[] = {
 
+#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
 #include <rte_pci_dev_ids.h>
 
-/* this device is the e1000 of qemu for testing */
-{RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x100E)},
-
 { .vendor_id = 0, /* sentinel */ },
 };
 
 struct rte_pci_id my_driver_id2[] = {
 
-/* IGB NICS */
-#undef RTE_LIBRTE_IXGBE_PMD
-#define RTE_LIBRTE_IGB_PMD 1
+/* 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 <rte_pci_dev_ids.h>