[dpdk-dev,3/3] eal: remove rte_pci_dev_ids.h

Message ID 1470406171-24754-4-git-send-email-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Ferruh Yigit Aug. 5, 2016, 2:09 p.m. UTC
  All PCI device ids moved to drivers, it is safe to delete
rte_pci_dev_ids.h

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/prog_guide/dev_kit_build_system.rst  | 28 +++++------
 lib/librte_eal/common/Makefile                  |  2 +-
 lib/librte_eal/common/include/rte_pci_dev_ids.h | 63 -------------------------
 3 files changed, 15 insertions(+), 78 deletions(-)
 delete mode 100644 lib/librte_eal/common/include/rte_pci_dev_ids.h
  

Comments

Thomas Monjalon Aug. 6, 2016, 12:55 p.m. UTC | #1
2016-08-05 15:09, Ferruh Yigit:
> All PCI device ids moved to drivers, it is safe to delete
> rte_pci_dev_ids.h

Good move. Thanks Ferruh!

> --- a/doc/guides/prog_guide/dev_kit_build_system.rst
> +++ b/doc/guides/prog_guide/dev_kit_build_system.rst
> @@ -93,20 +93,20 @@ Each build directory contains include files, libraries, and applications:
>      cmdline_cirbuf.h           rte_cycles.h         rte_memory.h
>      cmdline.h                  rte_debug.h          rte_mempool.h
>      cmdline_parse_etheraddr.h  rte_eal.h            rte_memzone.h
> -    cmdline_parse.h            rte_errno.h          rte_pci_dev_ids.h
> -    cmdline_parse_ipaddr.h     rte_ethdev.h         rte_pci.h
> -    cmdline_parse_num.h        rte_ether.h          rte_per_lcore.h
> -    cmdline_parse_portlist.h   rte_fbk_hash.h       rte_prefetch.h
> -    cmdline_parse_string.h     rte_hash_crc.h       rte_random.h
> -    cmdline_rdline.h           rte_hash.h           rte_ring.h
> -    cmdline_socket.h           rte_interrupts.h     rte_rwlock.h
> -    cmdline_vt100.h            rte_ip.h             rte_sctp.h
> -    exec-env                   rte_jhash.h          rte_spinlock.h
> -    rte_alarm.h                rte_launch.h         rte_string_fns.h
> -    rte_atomic.h               rte_lcore.h          rte_tailq.h
> -    rte_branch_prediction.h    rte_log.h            rte_tcp.h
> -    rte_byteorder.h            rte_lpm.h            rte_timer.h
> -    rte_common.h               rte_malloc.h         rte_udp.h
> +    cmdline_parse.h            rte_errno.h          rte_pci.h
> +    cmdline_parse_ipaddr.h     rte_ethdev.h         rte_per_lcore.h
> +    cmdline_parse_num.h        rte_ether.h          rte_prefetch.h
> +    cmdline_parse_portlist.h   rte_fbk_hash.h       rte_random.h
> +    cmdline_parse_string.h     rte_hash_crc.h       rte_ring.h
> +    cmdline_rdline.h           rte_hash.h           rte_rwlock.h
> +    cmdline_socket.h           rte_interrupts.h     rte_sctp.h
> +    cmdline_vt100.h            rte_ip.h             rte_spinlock.h
> +    exec-env                   rte_jhash.h          rte_string_fns.h
> +    rte_alarm.h                rte_launch.h         rte_tailq.h
> +    rte_atomic.h               rte_lcore.h          rte_tcp.h
> +    rte_branch_prediction.h    rte_log.h            rte_timer.h
> +    rte_byteorder.h            rte_lpm.h            rte_udp.h
> +    rte_common.h               rte_malloc.h
>      rte_config.h               rte_mbuf.h

What do you think about this list? I would say we can remove it.
  
David Marchand Aug. 8, 2016, 6:20 a.m. UTC | #2
On Sat, Aug 6, 2016 at 2:55 PM, Thomas Monjalon
<thomas.monjalon@6wind.com> wrote:
> What do you think about this list? I would say we can remove it.

Yes, we already discussed this with John.
http://dpdk.org/ml/archives/dev/2016-January/031595.html
  
Thomas Monjalon Aug. 23, 2016, 1:35 p.m. UTC | #3
2016-08-08 08:20, David Marchand:
> On Sat, Aug 6, 2016 at 2:55 PM, Thomas Monjalon
> <thomas.monjalon@6wind.com> wrote:
> > What do you think about this list? I would say we can remove it.
> 
> Yes, we already discussed this with John.
> http://dpdk.org/ml/archives/dev/2016-January/031595.html

Done: http://dpdk.org/commit/562ad630

This patch will be rebased when applying.
  

Patch

diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst
index fa2411f..e657e5f 100644
--- a/doc/guides/prog_guide/dev_kit_build_system.rst
+++ b/doc/guides/prog_guide/dev_kit_build_system.rst
@@ -93,20 +93,20 @@  Each build directory contains include files, libraries, and applications:
     cmdline_cirbuf.h           rte_cycles.h         rte_memory.h
     cmdline.h                  rte_debug.h          rte_mempool.h
     cmdline_parse_etheraddr.h  rte_eal.h            rte_memzone.h
-    cmdline_parse.h            rte_errno.h          rte_pci_dev_ids.h
-    cmdline_parse_ipaddr.h     rte_ethdev.h         rte_pci.h
-    cmdline_parse_num.h        rte_ether.h          rte_per_lcore.h
-    cmdline_parse_portlist.h   rte_fbk_hash.h       rte_prefetch.h
-    cmdline_parse_string.h     rte_hash_crc.h       rte_random.h
-    cmdline_rdline.h           rte_hash.h           rte_ring.h
-    cmdline_socket.h           rte_interrupts.h     rte_rwlock.h
-    cmdline_vt100.h            rte_ip.h             rte_sctp.h
-    exec-env                   rte_jhash.h          rte_spinlock.h
-    rte_alarm.h                rte_launch.h         rte_string_fns.h
-    rte_atomic.h               rte_lcore.h          rte_tailq.h
-    rte_branch_prediction.h    rte_log.h            rte_tcp.h
-    rte_byteorder.h            rte_lpm.h            rte_timer.h
-    rte_common.h               rte_malloc.h         rte_udp.h
+    cmdline_parse.h            rte_errno.h          rte_pci.h
+    cmdline_parse_ipaddr.h     rte_ethdev.h         rte_per_lcore.h
+    cmdline_parse_num.h        rte_ether.h          rte_prefetch.h
+    cmdline_parse_portlist.h   rte_fbk_hash.h       rte_random.h
+    cmdline_parse_string.h     rte_hash_crc.h       rte_ring.h
+    cmdline_rdline.h           rte_hash.h           rte_rwlock.h
+    cmdline_socket.h           rte_interrupts.h     rte_sctp.h
+    cmdline_vt100.h            rte_ip.h             rte_spinlock.h
+    exec-env                   rte_jhash.h          rte_string_fns.h
+    rte_alarm.h                rte_launch.h         rte_tailq.h
+    rte_atomic.h               rte_lcore.h          rte_tcp.h
+    rte_branch_prediction.h    rte_log.h            rte_timer.h
+    rte_byteorder.h            rte_lpm.h            rte_udp.h
+    rte_common.h               rte_malloc.h
     rte_config.h               rte_mbuf.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 1aae6f7..0000000
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ /dev/null
@@ -1,63 +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.
- *
- */
-
-#ifndef PCI_VENDOR_ID_INTEL
-/** Vendor ID used by Intel devices */
-#define PCI_VENDOR_ID_INTEL 0x8086
-#endif