From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 5AB458DB4 for ; Sun, 10 Jan 2016 13:51:12 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id f206so231618483wmf.0 for ; Sun, 10 Jan 2016 04:51:12 -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=kLX8PpLxplJGj+V2i8TQdje01urrzWOT0D61h/x82d4=; b=ZI3A5aCwDMVFcBattCTijMj9JGU8qpzx5QU2GOojJtFZkzJ4EbFmamFd0Q13EbhqAn m1xPhn5Bi9t1TB8PPVpWqQj32uTYxLWrwhjd+09+Khd3zftDV1+RXUDpyGrMPLzaimSc TTPZqhdBJOpF0pDMHyP5PkNnKcDM99AMAWMMcx2Bs7pkiZPLgf6ceQvXw8EXIc4L6l1t v9mQFtiGzNH0LlliEvAF2pScvWZXL4Vhd4jYXGSzCa5F57/NbuVCFv+RDs7hGGR8IkW3 YPJOD8cJc0NBDpIpv77r8dKT59P3VmgDJp6xM7VwMbZkKahP1ukjPTtTd910zFq4yu8x +7bA== 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=kLX8PpLxplJGj+V2i8TQdje01urrzWOT0D61h/x82d4=; b=gMdyy2lyG6hEQWL08NAMlKNaOvkjTu98SBYP5jAvgg2O7ynA2F91jmOq4rmCJSCkzj P0RLnj2YsbZakF6ycNBxkLOfNK4I6GWoIQBlbVIE8zgjhQ4k7PQYpuDlbaDP4UdjFhbH UyLmbPvKd5VxLzm7zXBPhh5QVuU71mK04Ue5vVuIHjf/kbqBlyvyiYUkfdveEHPaP5LI vs9D179kxVzQ1SKjePwlEm6okHhhBnusJSB8cpmuJcpYzB17Hfen8raKMnp/K8fWhJAg tRBzN6ox3nQN1u3AJumnU6ByLu0JIP+J8xGJBlr0r0uf2eSIcVOSw5V9Q3R+A2Vftrto vDeg== X-Gm-Message-State: ALoCoQnUxBDxoR1lgHrZ1uxzyAlTB3NMTWn0Pu4qKG3be0ZJ8VGMAHD7wkesljgvHmWCvnSGfyY/ReF7sml2WKk5VSLwMkKaZg== X-Received: by 10.194.205.103 with SMTP id lf7mr127033359wjc.147.1452430271988; Sun, 10 Jan 2016 04:51:11 -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 u12sm8088011wmu.10.2016.01.10.04.51.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jan 2016 04:51:11 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Sun, 10 Jan 2016 13:50:49 +0100 Message-Id: <1452430254-30390-7-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> Cc: thomas.monjalon@dpdk.org Subject: [dpdk-dev] [PATCH 06/11] 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: , X-List-Received-Date: Sun, 10 Jan 2016 12:51:12 -0000 Moved vmware device ids macro since the driver had no such information. Signed-off-by: David Marchand --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++---- lib/librte_eal/common/include/rte_pci_dev_ids.h | 16 ---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index c363bf6..b9de8eb 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -98,11 +98,10 @@ 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" - +{ RTE_PCI_DEVICE(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) }, { .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 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