From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Marchand Subject: [PATCH v3 06/13] vmxnet3: move pci device ids to driver Date: Wed, 20 Apr 2016 14:43:49 +0200 Message-ID: <1461156236-25349-7-git-send-email-david.marchand@6wind.com> References: <1453120248-28274-1-git-send-email-david.marchand@6wind.com> <1461156236-25349-1-git-send-email-david.marchand@6wind.com> Cc: thomas.monjalon@6wind.com, stephen@networkplumber.org, bruce.richardson@intel.com, nhorman@tuxdriver.com, pmatilai@redhat.com, christian.ehrhardt@canonical.com, Yong Wang To: dev@dpdk.org Return-path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id 8E1ED37AA for ; Wed, 20 Apr 2016 14:44:09 +0200 (CEST) Received: by mail-wm0-f41.google.com with SMTP id u206so79453687wme.1 for ; Wed, 20 Apr 2016 05:44:09 -0700 (PDT) In-Reply-To: <1461156236-25349-1-git-send-email-david.marchand@6wind.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Moved vmware device ids macro since the driver had no such information. Signed-off-by: David Marchand --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 9 ++++----- lib/librte_eal/common/include/rte_pci_dev_ids.h | 16 ---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 375e681..e3cfee4 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -100,12 +100,11 @@ static void vmxnet3_process_events(struct vmxnet3_hw *); /* * The set of PCI devices this driver supports */ +#define PCI_VENDOR_ID_VMWARE 0x15AD +#define VMWARE_DEV_ID_VMXNET3 0x07B0 static const struct rte_pci_id pci_id_vmxnet3_map[] = { - -#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, -#include "rte_pci_dev_ids.h" - -{ .vendor_id = 0, /* sentinel */ }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) }, + { .vendor_id = 0, /* sentinel */ }, }; static const struct eth_dev_ops vmxnet3_eth_dev_ops = { 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 448b5e1..0ecff3c 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -88,10 +88,6 @@ * Note that this file can be included multiple times within the same file. */ -#ifndef RTE_PCI_DEV_ID_DECL_VMXNET3 -#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_ENIC #define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) #endif @@ -104,11 +100,6 @@ #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) #endif -#ifndef PCI_VENDOR_ID_VMWARE -/** Vendor ID used by VMware devices */ -#define PCI_VENDOR_ID_VMWARE 0x15AD -#endif - #ifndef PCI_VENDOR_ID_CISCO /** Vendor ID used by Cisco VIC devices */ #define PCI_VENDOR_ID_CISCO 0x1137 @@ -119,12 +110,6 @@ #define PCI_VENDOR_ID_BROADCOM 0x14E4 #endif -/****************** VMware VMXNET3 devices ******************/ - -#define VMWARE_DEV_ID_VMXNET3 0x07B0 - -RTE_PCI_DEV_ID_DECL_VMXNET3(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) - /****************** Cisco VIC devices ******************/ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ @@ -183,4 +168,3 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF) */ #undef RTE_PCI_DEV_ID_DECL_BNX2X #undef RTE_PCI_DEV_ID_DECL_BNX2XVF -#undef RTE_PCI_DEV_ID_DECL_VMXNET3 -- 1.9.1