From patchwork Mon Jan 18 12:30:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 9940 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 89CE49191; Mon, 18 Jan 2016 13:31:06 +0100 (CET) Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 8D86D8E8D for ; Mon, 18 Jan 2016 13:31:01 +0100 (CET) Received: by mail-wm0-f47.google.com with SMTP id r129so49347527wmr.0 for ; Mon, 18 Jan 2016 04:31:01 -0800 (PST) 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=mb6eZzPOzH+zFJYlQOrcIpIsgA5Sq9IxIhMNqGWN/ps=; b=mBeMs9w93sYsoLCa0rXLL1Qxmu7ACfWt5fNUqufepF/qUejwr65MVEeLlp+S3x1mUK f1XrZwf55J9JPkz92qsjN4pHZVrdm7/j+xa/sibICesPTWEI+bF5FWMbaljcMo/kk7mX 12GzoEsH57CnJpOpJmSrbaTuuISKU1jJqfrZ+Pzxz7oclcVzxgXvZ7ka10FLF8iXBQHg Y9ZlOFeXgYvS59rRIynP6MTkG8IVE9EkFC8H5SESfGLezfx43KFzozxmDJVBU8K7nzCd D+koqZnzCc4Xej0Owa40ymKJIQyzn3L/bjdF5mh1zjlucne8EFm7MRAtYpM2hAhr2vvY Qu2A== 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=mb6eZzPOzH+zFJYlQOrcIpIsgA5Sq9IxIhMNqGWN/ps=; b=bKYex2ljMrv4XsiLyD5EfLbXrOYnmrb86ug45GMEfhZ/7IU9cVe7GI18sf70oSr5Ey hLDnBH+8Xi7yUhw04SStCyo46772VohXlaJim53XN2WIzFmyVoQfHiLmx0d9FFSFcvD+ SjEoOZba95HvugebqEHbdY1+IgjpUWN0XO+YrDGsoFPxBI0EbrSwV2hffzbEj89YvjQD dQcFxvQji9DkhMRS4ZPIxst2JD9DuKPZq3+yb7yPcnPkNYpp2dbYo0BVJRL8ai+Ny64R wr+LVyVsyxuDIcj9Pz7lXtLtIIY/pRJhOdsrJBdFYfruKHvV4ZhMUzmPHzX7i2jecZQd mgfA== X-Gm-Message-State: ALoCoQn/rtaXKEigQWeayVbWKyNJGagHDWHv+x/AJbRwdaH8UgJZuChxx12/BTsq6HS6SpfHBGMTTzILC22rGqwFsxEHdv2DKA== X-Received: by 10.194.120.226 with SMTP id lf2mr23740378wjb.108.1453120261446; Mon, 18 Jan 2016 04:31:01 -0800 (PST) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id u191sm15606572wmd.4.2016.01.18.04.31.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jan 2016 04:31:00 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Mon, 18 Jan 2016 13:30:44 +0100 Message-Id: <1453120248-28274-7-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453120248-28274-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> <1453120248-28274-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 06/10] 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 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 --- Changes since v1: - indent fix 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 c363bf6..304f076 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -98,12 +98,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