From patchwork Mon Oct 23 11:10:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116718 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4547908qgn; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) X-Received: by 10.200.49.38 with SMTP id g35mr18463705qtb.32.1508759198454; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759198; cv=none; d=google.com; s=arc-20160816; b=a8NrZR4UMH7A9KomOkRyhDHPTL08IVnKwK4lq8weuaVkURm2YaY1Sf1Rzeq61x1gbk pQCuP75hD0a36O1JNvRCR6hyZBnoLdfjgyuoHpEmXPzISIKyvwfyTBt2lJlJFZos2daj oQrHSy6Lh+QKiaMDgfzBaDs3oF83IZDW4JSTDw1LAN6cFmWj4o9X9spghxiMToJMVSdU zSg5GonE3rqwFPjFj22FV1WZaT2zlEbxPMYw8YN4PcD3h2C5AufNV1R++ajgcjlZ/VPS PrbIS9ZP0J17zCSXQIjTbYomjssCbPKPXQEPKLyHWFX9ZuCt+h52Qhr4P8Pug9DUvm/9 MCNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=yl2MYPlakMfyCBfzNfUqi5vlLM9QSynkMdYnUqd63lA=; b=f8OdGdMQLh8JANT1kKjhmg5FhycoRJfZFSvUdh+LBeGBsrMMitinfcQ4cybu/1QUZE qqcPPjB1ni6W++LBJb/W1kR5sOMHsvV1GydI3dGIRZLawt1wX2pB7WdEXGDQKvIeY/I0 g8TsEPoK12+SB4Ys1mnCiW6EFmmHM3fwwkO+W5QHSZcjbhusCE/up5GHvOoN58gAMD56 UqCl88GT+g5pO0NL8qD2D/BFsXJ7Vp9Z8ijmNrdfUQxr4iuQCgDInCHr7pWdSRC11hdh PZox8KB4sf4pnduOD/N+LYiW+qkBcC4/AH2EgSiHo63G+69tHH5lCxIOt8ukg27Ewop1 MpFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id b29si5710147qta.377.2017.10.23.04.46.38; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2719662960; Mon, 23 Oct 2017 11:46:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5414C628B1; Mon, 23 Oct 2017 11:15:10 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 89775622E8; Mon, 23 Oct 2017 11:14:17 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 9D52662289 for ; Mon, 23 Oct 2017 11:11:28 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id p184so19619533lfe.12 for ; Mon, 23 Oct 2017 04:11:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yl2MYPlakMfyCBfzNfUqi5vlLM9QSynkMdYnUqd63lA=; b=XKE3jtFKYcz5hUSYdFzs6vHE3NmIsrO3EE70iixWe8Gne+ZQ56TyASaLNFNxG4xw/7 kq2B8iUOT7vZ70rm9MbnyHbvVpC3eanmtp8vQfxhgfCMhgEQNrjrnXLHQtESZ50Rkwm2 0W0EzmakEZQY4/ewDpX32x/eZm1dr/JOYHe5U27ML45pp0C1H5yK3gh+dxoiw8MgaEA8 ps3viD2Y/Vy2XU+KOtQwhmzytMhrP8lfHEi2GcwvQHoy55MPDTqHnELaUymSrPQr6art 4Oh7R7gw15wZn03aS1SZtDzqICn5Xt7a20+6Y6pJZyb/Sd9nTfIvb2jILIWKCNesbWTI 8s7Q== X-Gm-Message-State: AMCzsaUuisUBGFpD/7AEPXaXNtKbe6h0eASzayP67lhO7F5J9Pawkc6A KbNR/ykfTRSaMNY7/kPGv0cGw/1i6+oFLA== X-Google-Smtp-Source: ABhQp+ThDeMa15H37WePf/u64pZj23iHvn5kZMFiHI0fE+DDr1O36BvWevCBY1V0ZZ9Wpvm+lym+rw== X-Received: by 10.25.178.205 with SMTP id t74mr3996057lfk.152.1508757087255; Mon, 23 Oct 2017 04:11:27 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:26 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:46 +0300 Message-Id: <20171023111057.6328-19-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 18/29] linux-gen, include: switch atomic.h to api+abi X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 1 + include/odp/api/atomic.h | 28 +++++++++++++++ platform/linux-generic/Makefile.am | 3 +- .../odp/api/abi/atomic.h} | 14 ++++++-- platform/linux-generic/include/odp/api/atomic.h | 42 ---------------------- .../linux-generic/include/odp/api/ticketlock.h | 1 + platform/linux-generic/odp_atomic.c | 1 + 7 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 include/odp/api/atomic.h rename platform/linux-generic/{include/odp/api/plat/atomic_types.h => include-abi/odp/api/abi/atomic.h} (86%) delete mode 100644 platform/linux-generic/include/odp/api/atomic.h -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 946b7c07cf73..d1eb26bc59c2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -5,6 +5,7 @@ include_HEADERS = \ odpapiincludedir= $(includedir)/odp/api/ odpapiinclude_HEADERS = \ + odp/api/atomic.h \ odp/api/barrier.h \ odp/api/buffer.h \ odp/api/cpumask.h \ diff --git a/include/odp/api/atomic.h b/include/odp/api/atomic.h new file mode 100644 index 000000000000..8e515ec6f736 --- /dev/null +++ b/include/odp/api/atomic.h @@ -0,0 +1,28 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP atomic operations + */ + +#ifndef ODP_API_ATOMIC_H_ +#define ODP_API_ATOMIC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 1516f8ee7aee..304ca86862f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,7 +20,6 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/atomic.h \ include/odp/api/byteorder.h \ include/odp/api/chksum.h \ include/odp/api/classification.h \ @@ -47,7 +46,6 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ - include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/packet_flag_inlines.h \ @@ -68,6 +66,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir= $(includedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h similarity index 86% rename from platform/linux-generic/include/odp/api/plat/atomic_types.h rename to platform/linux-generic/include-abi/odp/api/abi/atomic.h index c0803bf11f63..0b7b254ced23 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */ -#ifndef ODP_ATOMIC_TYPES_H_ -#define ODP_ATOMIC_TYPES_H_ +#ifndef ODP_API_ABI_ATOMIC_H_ +#define ODP_API_ABI_ATOMIC_H_ #ifdef __cplusplus extern "C" { @@ -59,6 +59,16 @@ typedef struct odp_atomic_u64_s odp_atomic_u64_t; typedef struct odp_atomic_u32_s odp_atomic_u32_t; +/** @ingroup odp_atomic + * @{ + */ + +#include +#include + +/** + * @} + */ #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/atomic.h b/platform/linux-generic/include/odp/api/atomic.h deleted file mode 100644 index 7886cb4ea382..000000000000 --- a/platform/linux-generic/include/odp/api/atomic.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2013, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP atomic operations - */ - -#ifndef ODP_PLAT_ATOMIC_H_ -#define ODP_PLAT_ATOMIC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/** @ingroup odp_atomic - * @{ - */ - -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif - -/** - * @} - */ - -#include - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/platform/linux-generic/include/odp/api/ticketlock.h index e0f5d81fd6ed..ca12cc37cf9f 100644 --- a/platform/linux-generic/include/odp/api/ticketlock.h +++ b/platform/linux-generic/include/odp/api/ticketlock.h @@ -19,6 +19,7 @@ extern "C" { #include +#include #if ODP_ABI_COMPAT == 0 #include #endif diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 53123b675595..1d76caf2b82f 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #if ODP_ABI_COMPAT == 1 #include #endif