From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <david.marchand@6wind.com>
Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51])
by dpdk.org (Postfix) with ESMTP id 935198D8F
for <dev@dpdk.org>; Mon, 18 Jan 2016 13:31:05 +0100 (CET)
Received: by mail-wm0-f51.google.com with SMTP id u188so102071250wmu.1
for <dev@dpdk.org>; Mon, 18 Jan 2016 04:31:05 -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=yWX6NqLO+rz+RSiwU56R151/fCDf40tJFGrxgLlGLdU=;
b=DVP3F7RhudfnswidzfYzUZhHlcVVg8WHHk8rLB0gmN9xWUM8yu1Qj4IGwPR9Mvop10
MHM4GoD0M4MQOg71X8PZoLLrd6NdiQx+T+d4BTopLrdLdVADkNWi1YVScjd+qKPoTgXp
8ESCGsRxPJkj3KWjzK8zF/uC7hU6q0JwherG0l3j7zKkqPQTdbO7VBc+whx67W53XAgt
dTdD0YzwOkwUI7urylQfSbnmAgm004sDxMkHkyAlg7VCkFO+SuiQBcEpdpw9oyf51CIy
506LV6blvVccVEJ+L2/OhOLUjnOcn7jTJ7QTx9VtCkt2twz8jH327+8AmJX2nhf0Ungf
l7jg==
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=yWX6NqLO+rz+RSiwU56R151/fCDf40tJFGrxgLlGLdU=;
b=lJnwNHExEtqCMkQU3V9RGGAsv5gei8cRimRQZYNJz1xCCfqF+YM9eruXkvcXBmy2Aw
QEOcn5myXwc3ZRVnOK0D/wFnWxu1XG5tDhFalR3MzUK3BVVrB8ZIwCY+VECUNvlBk1kA
046LwUktyPRVVv0OnqOBdR/HwI+N29jicZeuThOPQ7M3Mq2TxgDNfNgaqzPaI4eIAEnc
Iu95pb/LZkMv60V3M6aq0Y1X7IYr8j5qNRUTYE9TeT5ALDglQu6QtgNm21l5mVBBobh/
voKBQrULBkqF4RW0If1ZH7F6AgpGh7az0KyqCJY/0m1Dr62nCTu1w3B2pY/q7AQwW3Sq
spBA==
X-Gm-Message-State: AG10YOSCgj+WaF+qxzr7hAsQ52lVXZxDpACx5twkEnn6rH4iLztDXjptPymnv0qPApXyWZ+6
X-Received: by 10.28.226.139 with SMTP id z133mr13726561wmg.75.1453120265447;
Mon, 18 Jan 2016 04:31:05 -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.03
(version=TLSv1/SSLv3 cipher=OTHER);
Mon, 18 Jan 2016 04:31:04 -0800 (PST)
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Date: Mon, 18 Jan 2016 13:30:47 +0100
Message-Id: <1453120248-28274-10-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 09/10] pci: no need for global device ids list
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: Mon, 18 Jan 2016 12:31:05 -0000
Now that all pci device ids are in their respective drivers, we can remove
this header.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
doc/api/doxy-api-index.md | 1 -
lib/librte_eal/common/Makefile | 2 +-
lib/librte_eal/common/include/rte_pci_dev_ids.h | 93 -------------------------
3 files changed, 1 insertion(+), 95 deletions(-)
delete mode 100644 lib/librte_eal/common/include/rte_pci_dev_ids.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 7a91001..0540aba 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -45,7 +45,6 @@ There are many libraries, so their headers may be grouped by topics:
[vhost] (@ref rte_virtio_net.h),
[KNI] (@ref rte_kni.h),
[PCI] (@ref rte_pci.h),
- [PCI IDs] (@ref rte_pci_dev_ids.h)
- **memory**:
[memseg] (@ref rte_memory.h),
diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
index f5ea0ee..bb9810d 100644
--- a/lib/librte_eal/common/Makefile
+++ b/lib/librte_eal/common/Makefile
@@ -34,7 +34,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
INC := rte_branch_prediction.h rte_common.h
INC += rte_debug.h rte_eal.h rte_errno.h rte_launch.h rte_lcore.h
INC += rte_log.h rte_memory.h rte_memzone.h rte_pci.h
-INC += rte_pci_dev_ids.h rte_per_lcore.h rte_random.h
+INC += rte_per_lcore.h rte_random.h
INC += rte_tailq.h rte_interrupts.h rte_alarm.h
INC += rte_string_fns.h rte_version.h
INC += rte_eal_memconfig.h rte_malloc_heap.h
diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h
deleted file mode 100644
index 6720b7a..0000000
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- * Intel Corporation
- *
- * BSD LICENSE
- *
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Intel Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/**
- * @file
- *
- * This file contains a list of the PCI device IDs recognised by DPDK, which
- * can be used to fill out an array of structures describing the devices.
- *
- * Currently four families of devices are recognised: those supported by the
- * IGB driver, by EM driver, those supported by the IXGBE driver, and by virtio
- * driver which is a para virtualization driver running in guest virtual machine.
- * The inclusion of these in an array built using this file depends on the
- * definition of
- * at the time when this file is included.
- *
- * In order to populate an array, the user of this file must define this macro:
- * RTE_PCI_DEV_ID_DECL_IXGBE(vendorID, deviceID). For example:
- *
- * @code
- * struct device {
- * int vend;
- * int dev;
- * };
- *
- * struct device devices[] = {
- * #define RTE_PCI_DEV_ID_DECL_IXGBE(vendorID, deviceID) {vend, dev},
- * #include <rte_pci_dev_ids.h>
- * };
- * @endcode
- *
- * Note that this file can be included multiple times within the same file.
- */
-
-/*
- * Undef all RTE_PCI_DEV_ID_DECL_* here.
- */
--
1.9.1