From patchwork Mon Dec 14 13:00:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 9534 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 A950E8E7D; Mon, 14 Dec 2015 14:01:08 +0100 (CET) Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by dpdk.org (Postfix) with ESMTP id B14C08E7D for ; Mon, 14 Dec 2015 14:01:07 +0100 (CET) Received: by pfnn128 with SMTP id n128so105338650pfn.0 for ; Mon, 14 Dec 2015 05:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WJzQrgFtXcTKA+ciqqJFWJbK0Lyd6lXf6TXahTk0i88=; b=C7o0P+T28m9aGY22QgnGuhrxWbfyEgUZzE+olYf5dtMPhQlKn3kGM+7dTf373OcSU8 wVuLq2ZF/r6+v79epKfxWXLhD4xktTnx4uSNWNfDeuBq42GGLP2TK9cjEkY8chp1zEhW DOkXbmMqv1rbz2d6ySTaSPuDzFLx83J8DB221m/8uL3mo7DS2RLu+eP+dqbdi3U4Qdqg v5idPpJ59rGQwX2/aq9NqWKsgA8anaUtJdvdetyZcx0DqFudIA/gLWqhV4n8FSpqUQ90 8rLHizxsipCvE2rFPsKiBou1AAg9BSnk/iGQlb+HlDHddrVvkg2bYS1ATQUXaKAFQj6A plFQ== 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=WJzQrgFtXcTKA+ciqqJFWJbK0Lyd6lXf6TXahTk0i88=; b=ERvAnTdTbXLd7uNWMmnTnAECrPJAWKsBazigd5d/HpPxd/vX2op9DUklJYrpeGMMJ+ m4BWmb1LtMUH7aZu31C49K+7EcXXusltQtkK5B3ui/56xfABcrxpXToZf472v3mUoJix r/DW1Lsdr9FqX0dRpMmziDg4hRSRbzkFcRGYr702thw/A1aA/Bra8VN01SCd94+an4S3 kS0KSNPcEBCFCVPDEI2bhY+h6cTDb1oYcIw5c0DyH8ViiE6iuGTZ6xYm3gyMd95kzE4x 0gSWBmfpPXAeMoWvrPhYxVtdkvhwnCr5KPqPTu1mf2ipHlJf+zvo3cuo2vQ934SefgP9 TA1A== X-Gm-Message-State: ALoCoQkhtZJ+nOJokw/IoM3Z6oFn5AbgNn+kioKluxiAZqfKzxuC+VNNttdYeXEAjW0eRTprUn4aaOf3m7qCgc5ao5oEPGppPw== X-Received: by 10.98.8.139 with SMTP id 11mr35847203pfi.35.1450098067114; Mon, 14 Dec 2015 05:01:07 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([110.172.16.5]) by smtp.gmail.com with ESMTPSA id 9sm42506405pfn.51.2015.12.14.05.01.04 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 05:01:06 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Mon, 14 Dec 2015 18:30:27 +0530 Message-Id: <1450098032-21198-9-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1450098032-21198-1-git-send-email-sshukla@mvista.com> References: <1450098032-21198-1-git-send-email-sshukla@mvista.com> Subject: [dpdk-dev] [ [PATCH v2] 08/13] rte_io: x86: Remove sys/io.h ifdef x86 clutter 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" Replace sys/io.h with rte_io.h, Get rid of ifdef X86 clutter Signed-off-by: Santosh Shukla --- drivers/net/virtio/virtio_pci.h | 4 --- lib/librte_eal/common/include/arch/x86/rte_io.h | 42 +++++++++++++++++++++++ lib/librte_eal/linuxapp/eal/eal.c | 4 +-- 3 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 lib/librte_eal/common/include/arch/x86/rte_io.h diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index f3e4178..c51d980 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -40,12 +40,8 @@ #include #include #else -#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) -#include -#else #include #endif -#endif #include diff --git a/lib/librte_eal/common/include/arch/x86/rte_io.h b/lib/librte_eal/common/include/arch/x86/rte_io.h new file mode 100644 index 0000000..ffd6888 --- /dev/null +++ b/lib/librte_eal/common/include/arch/x86/rte_io.h @@ -0,0 +1,42 @@ +/* + * BSD LICENSE + * + * Copyright(c) 2015 Cavium Networks. All rights reserved. + * All rights reserved. + * + * Copyright(c) 2010-2015 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 _RTE_IO_X86_H_ +#define _RTE_IO_X86_H_ + +#include "generic/rte_io.h" + +#endif /* _RTE_IO_X86_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 2617037..29950f3 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -49,9 +49,7 @@ #include #include #include -#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) -#include -#endif +#include #include #include