From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <david.marchand@6wind.com>
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 <dev@dpdk.org>; Wed, 20 Apr 2016 14:44:09 +0200 (CEST)
Received: by mail-wm0-f41.google.com with SMTP id u206so79453687wme.1
for <dev@dpdk.org>; Wed, 20 Apr 2016 05:44:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=6wind-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=J2/MFVyC3VV666z2LGuMH7oldB4jV4I0U5mJCePicVg=;
b=XtjFTUQ4W+kxf4DfeyRtAOc9xaOfYyOV3auzbOC/3RkrG0wxlR0I2MSvetlNFnbA5y
fpuGA2Un2y/HkWUYqW+4E1J0kofh60X/PbDqJqDtM7NiUSI/pdBi/qaStt+t+ehlO4jm
AlnZrhivFITDWATElRLdqBKoJCdTjTAOFt6UpsAO6NlyGODwGFrpq9aOh0won/BsqJ34
7SL119g7cv3dHgp6WPiwlEBLOtw5uhlArnFWbxUEg8BpCh84jS0C2lv70BnZQeYzRtf+
t4OeYVPpvMiUnEp1twCaOpGFRR1gihINwynrwDrZqsY7hXxGPztBqeEQqXnrAi2sAI0x
zYnQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=J2/MFVyC3VV666z2LGuMH7oldB4jV4I0U5mJCePicVg=;
b=hBLex+3OMWCwjurF5ELiQmAOgnXcgpzegDb0E2vCwsqfGIxe8KUSgow8qIX8i6NSzB
QDX5vS9nTgYVuQzZgcevQrzZe9TAAFxBjrEipBInvvg2G/gTfXKp9AsKAfBqrRq3gmUG
33vOBjBs5NjmedUTZq/bdxiJ7Q/x+6dPSD9K/VrslS89+MK9bMwnwvGjUikKJvvNSDHu
O/pt2aOPCFIXCnfItOTwRYxB+75J1yuiMlq52PvwYI7CQvm5NZhtXTIhj9cGCArQFtNQ
iZEoKDdhrvcQggw5z0gI+QHyr83282kRk6Rlow5dd6V6N4s1BxOj4+nKfrKJkkG+5YdI
Oh7Q==
X-Gm-Message-State: AOPr4FWYGQGp5yRE3lAYBZh5ltCwoa5Ifwemthcq8BywP/Z9LlpNkGLilB64KiWhYBw0EnVM
X-Received: by 10.194.59.138 with SMTP id z10mr8482766wjq.74.1461156249416;
Wed, 20 Apr 2016 05:44:09 -0700 (PDT)
Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net.
[78.126.77.144])
by smtp.gmail.com with ESMTPSA id j10sm5428135wjb.46.2016.04.20.05.44.08
(version=TLSv1/SSLv3 cipher=OTHER);
Wed, 20 Apr 2016 05:44:08 -0700 (PDT)
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Cc: thomas.monjalon@6wind.com, stephen@networkplumber.org,
bruce.richardson@intel.com, nhorman@tuxdriver.com, pmatilai@redhat.com,
christian.ehrhardt@canonical.com, Yong Wang <yongwang@vmware.com>
Date: Wed, 20 Apr 2016 14:43:49 +0200
Message-Id: <1461156236-25349-7-git-send-email-david.marchand@6wind.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1461156236-25349-1-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>
Subject: [dpdk-dev] [PATCH v3 06/13] vmxnet3: move pci device ids to driver
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 12:44:09 -0000
Moved vmware device ids macro since the driver had no such information.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
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