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 E95092C4B for ; Mon, 5 Dec 2016 18:50:49 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id g23so105331760wme.1 for ; Mon, 05 Dec 2016 09:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=XveUya9qnqii1xRBCumyCPIM0RWR9PKD57Y632jtiZ4=; b=OmfRPvhNpz1luWeRVcvJgPkne7Ft8kFqkgPFCVbf/NxKaYm6LJChhY4xrrVJAh03A7 Ahz1BQ2CtD0WR2Kd+Y6d2Ypl1om4cg6Gd3ZaqtdqjAUtkLnM48xEn6raKjO/khGBKvU/ neJXqw5G4z/xwwCBBAfFeFTK782RDyKOdu2lA5Xvl6yOz3HcBHzd/KNyXXCcfuart04p XwutJPC4rxm11elMMOIqlB4rPkk/uNAZF3ze2oHUGvZTIPrRegUFdoXN9JMByXZqsInd rfxYVM1koLMX8NBCz8vtw/oLfnTgWeHLcBHS+OQTEeweir681CbDUAMuWyjH4ubifLJh 6+3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=XveUya9qnqii1xRBCumyCPIM0RWR9PKD57Y632jtiZ4=; b=JC6cgLS1OTNwyem5IzxuTK1mWKO8SxZgkjv96JgwhKceqmTFftu+LZDEfhIHn5wHx0 w+bPrID41A1bFL5fdagOXy4Cno3C0jZnp8gBnS3F6XHg1v4J2Ag444iurHz1jWt2bH61 seQ3OT66Cbss6wmFf02eJcXbsfanKmfgDbz29V3RcMZFuKVXpmJkUGc07ydIA5BUD3zw Fzw0vD66N8jEv7Sj031y8nVtawD9tqaz3yill0lIV4td0UMzVtnq9xPx8AdvQrF21XOZ rz8fCkqs8X/yVNvn+bI+g/5PFLiTiGR5ogNiap0WrYSkYCtIfnO8CHymQAUIEp9rMsqq 7oAA== X-Gm-Message-State: AKaTC01BId6Cwscm5db+rMQwc5VZ3Rp3/ZANhGmyppKJd8zy+LEahndAVPf47yf0Nt9IXwzJ X-Received: by 10.28.135.3 with SMTP id j3mr10035667wmd.96.1480960249375; Mon, 05 Dec 2016 09:50:49 -0800 (PST) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id vr9sm21490529wjc.35.2016.12.05.09.50.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Dec 2016 09:50:48 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Mon, 5 Dec 2016 18:50:43 +0100 Message-Id: <1480960243-29173-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 Subject: [dpdk-dev] [PATCH] use config flags for target OS checks X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2016 17:50:50 -0000 Clean up the code to always use the flags RTE_EXEC_ENV_*APP set up in the DPDK configuration instead of the native ones. Signed-off-by: Thomas Monjalon --- app/test-pmd/cmdline.c | 4 ++-- app/test/commands.c | 4 ++-- app/test/test_cmdline_ipaddr.c | 4 ++-- drivers/net/bnx2x/bnx2x.c | 4 ++-- drivers/net/bnx2x/bnx2x.h | 4 ++-- examples/cmdline/commands.c | 4 ++-- lib/librte_cmdline/cmdline_parse_etheraddr.c | 2 +- lib/librte_cmdline/cmdline_parse_ipaddr.c | 4 ++-- lib/librte_eal/common/include/rte_lcore.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 63b55dc..7f3667d 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -41,8 +41,8 @@ #include #include #include -#ifndef __linux__ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_BSDAPP #include #else #include diff --git a/app/test/commands.c b/app/test/commands.c index 2df46b0..da0c035 100644 --- a/app/test/commands.c +++ b/app/test/commands.c @@ -39,8 +39,8 @@ #include #include #include -#ifndef __linux__ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_BSDAPP #include #endif #endif diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c index 471d2ff..16570fb 100644 --- a/app/test/test_cmdline_ipaddr.c +++ b/app/test/test_cmdline_ipaddr.c @@ -36,8 +36,8 @@ #include #include -#ifndef __linux__ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_BSDAPP #include #else #include diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 2856630..47cf5d3 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -9484,7 +9484,7 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc) return -ENOMEM; } -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_BSDAPP pci_read(sc, PCI_STATUS, &status, 2); if (!(status & PCI_STATUS_CAP_LIST)) { #else @@ -9495,7 +9495,7 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc) return -1; } -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_BSDAPP pci_read(sc, PCI_CAPABILITY_LIST, &pci_cap.next, 1); #else pci_read(sc, PCIR_CAP_PTR, &pci_cap.next, 1); diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 5cefea4..006ad28 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -41,7 +41,7 @@ #include "elink.h" -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_BSDAPP #include #define PCIY_PMG PCI_CAP_ID_PM @@ -71,7 +71,7 @@ #define IFM_10G_TWINAX 22 /* 10GBase Twinax copper */ #define IFM_10G_T 26 /* 10GBase-T - RJ45 */ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_BSDAPP #define PCIR_EXPRESS_DEVICE_STA PCI_EXP_TYPE_RC_EC #define PCIM_EXP_STA_TRANSACTION_PND PCI_EXP_DEVSTA_TRPND #define PCIR_EXPRESS_LINK_STA PCI_EXP_LNKSTA diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c index f3ba247..205a205 100644 --- a/examples/cmdline/commands.c +++ b/examples/cmdline/commands.c @@ -66,8 +66,8 @@ #include #include #include -#ifndef __linux__ - #ifdef __FreeBSD__ +#ifndef RTE_EXEC_ENV_LINUXAPP + #ifdef RTE_EXEC_ENV_BSDAPP #include #else #include diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c index dbfe4a6..1f26426 100644 --- a/lib/librte_cmdline/cmdline_parse_etheraddr.c +++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c @@ -85,7 +85,7 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = { #define ETHER_ADDRSTRLENLONG 18 #define ETHER_ADDRSTRLENSHORT 15 -#ifdef __linux__ +#ifdef RTE_EXEC_ENV_LINUXAPP #define ea_oct ether_addr_octet #else #define ea_oct octet diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c index d3d3e04..4ef1c57 100644 --- a/lib/librte_cmdline/cmdline_parse_ipaddr.c +++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c @@ -86,8 +86,8 @@ #include #include #include -#ifndef __linux__ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_BSDAPP #include #else #include diff --git a/lib/librte_eal/common/include/rte_lcore.h b/lib/librte_eal/common/include/rte_lcore.h index fe7b586..f74bc0c 100644 --- a/lib/librte_eal/common/include/rte_lcore.h +++ b/lib/librte_eal/common/include/rte_lcore.h @@ -50,9 +50,9 @@ extern "C" { #define LCORE_ID_ANY UINT32_MAX /**< Any lcore. */ -#if defined(__linux__) +#if defined(RTE_EXEC_ENV_LINUXAPP) typedef cpu_set_t rte_cpuset_t; -#elif defined(__FreeBSD__) +#elif defined(RTE_EXEC_ENV_BSDAPP) #include typedef cpuset_t rte_cpuset_t; #endif -- 2.7.0