From patchwork Mon Oct 23 11:10:51 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: 116723 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4560000qgn; Mon, 23 Oct 2017 05:01:02 -0700 (PDT) X-Received: by 10.237.37.76 with SMTP id w12mr19147095qtc.201.1508760062361; Mon, 23 Oct 2017 05:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760062; cv=none; d=google.com; s=arc-20160816; b=aLhTYzIH66F0CdKkAOMJbQL3+yMUyWu74fB2OFzachJ0YK8jHrHZCI8CKvmdblAbMV 0Lp5hPIUpk+NpfZ2w+CHIN1ptdb2GhOtiVLKg+U7NyuhNnDB1P7XtGnLQY2xauzD7ItV xh13AGsfq45ysOsa0OtRDtoWnFtz0j/JC+WtpDn4Pk/OkWSfzpLuoi73LRzjVda80vww YoKeNjTAR+BYdUTz0d7tjEnoCQPQnn4luJqCT5o0/yOaKfIUSfmngffRsA74s/EXvLY7 xUGYY4gU6dN3mTxyvE35/mM7DeNvuMM8vElXmU7gLdo4fcr8jeFYLN/wMGozbMiw8dMn FdEw== 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=Bcwx75+M3+lsP1dr7t94AdzR1iq4F1UAHx4E7xvO1fc=; b=G96B5ev5GWAoY7AoyHYdySMM324SbzAtAIufUmW/Q+PCJA6gWUcyse4VWsGWD7wqhu wp8GPND/LLjzZvwqYlrQLpxzOO+IdBF8inMIBGgiBv+1WLAzLZHwEdKXWhynHhe8rUZ9 P1Cak+/Qk9Afjf+um2KHRKUM7Fis27nGkhlftjsJpybgx4qcxzZ05BPZobX4VZ2ipMED oHFeZXdt9vYWCNIxGNhueVfIjpz+Y7CKFH3Jvch3uhRAHvVEUYfuOZMfWd2g3SQ7diPD uOSsIzPDsHARQlQAIaIoc4qZT/fsZhSiAk4UT/iymwtmprXMYK/1Ln55fBuHBKLhuH74 yRCw== 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 a67si5815305qkf.101.2017.10.23.05.01.02; Mon, 23 Oct 2017 05:01:02 -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 F14476298C; Mon, 23 Oct 2017 12:01:01 +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 3787B62909; Mon, 23 Oct 2017 11:16:13 +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 B187A62907; Mon, 23 Oct 2017 11:15:58 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 45A926204C for ; Mon, 23 Oct 2017 11:11:34 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id 75so19658705lfx.1 for ; Mon, 23 Oct 2017 04:11:34 -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=Bcwx75+M3+lsP1dr7t94AdzR1iq4F1UAHx4E7xvO1fc=; b=MLBudenn72IBEs/8Ko4QExUQVXDmCOZjNeXHikGPwFB57ZtP0jcS7rH23Y2/8rogNw SVY1HQQ5iC+31HnCGtdjUd4DwsLUHnfx/VWdRcYTzl+xUF8zX9TSjtnbl/BVi+Kg4obq sluIoRJgvXDS6bcuH+w4hjia+LTVSh9SC69dczicKub+AWRPqGc3ROL23bEI/ZeihyOL hCEcPX+3BmK1xmWCa3ku7otjojxZcCh2PEMCwhfwwdKrGwqLcO0J5EhfuALnMmiAUW3O PlFATrbMobJFoyqveQiVwUfK2lGpT+JtRKSqjTURc2yf/V/NqBcgVliklG2aRpuCEHxN E5cw== X-Gm-Message-State: AMCzsaX+xZhAf8AE3uRj873e2Hu0Ytr3VxPBfdc2F4A4n6/twHhoZUDe zFjuufrIZ06sOZuaHSZ8ZukukGFB9yPUzw== X-Google-Smtp-Source: ABhQp+Sme7dIhhapIbbvTCdA7uZkCJbFxCKU5pS1BrjSHPwuEGPWPawGVw+EcbQnk77AqxmW31ZL4g== X-Received: by 10.25.162.140 with SMTP id l134mr4264770lfe.126.1508757092705; Mon, 23 Oct 2017 04:11:32 -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.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:32 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:51 +0300 Message-Id: <20171023111057.6328-24-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 23/29] linux-gen, include: move more headers from platform to generic 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" Move more generic headers from platform include dir to common include dir. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 10 ++++++++++ {platform/linux-generic/include => include}/odp/api/chksum.h | 12 ++---------- .../linux-generic/include => include}/odp/api/compiler.h | 12 ++---------- .../linux-generic/include => include}/odp/api/deprecated.h | 4 ++-- {platform/linux-generic/include => include}/odp/api/errno.h | 5 ++--- .../linux-generic/include => include}/odp/api/feature.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/hash.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/hints.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/random.h | 12 ++---------- .../linux-generic/include => include}/odp/api/support.h | 12 ++---------- .../linux-generic/include => include}/odp/api/system_info.h | 5 ++--- platform/linux-generic/Makefile.am | 12 +----------- 12 files changed, 31 insertions(+), 89 deletions(-) rename {platform/linux-generic/include => include}/odp/api/chksum.h (72%) rename {platform/linux-generic/include => include}/odp/api/compiler.h (69%) rename {platform/linux-generic/include => include}/odp/api/deprecated.h (82%) rename {platform/linux-generic/include => include}/odp/api/errno.h (83%) rename {platform/linux-generic/include => include}/odp/api/feature.h (71%) rename {platform/linux-generic/include => include}/odp/api/hash.h (72%) rename {platform/linux-generic/include => include}/odp/api/hints.h (70%) rename {platform/linux-generic/include => include}/odp/api/random.h (70%) rename {platform/linux-generic/include => include}/odp/api/support.h (73%) rename {platform/linux-generic/include => include}/odp/api/system_info.h (82%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 617aa4a6e67a..addf4bc92261 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -9,12 +9,20 @@ odpapiinclude_HEADERS = \ odp/api/barrier.h \ odp/api/buffer.h \ odp/api/byteorder.h \ + odp/api/chksum.h \ + odp/api/compiler.h \ odp/api/cpumask.h \ + odp/api/deprecated.h \ + odp/api/errno.h \ odp/api/event.h \ + odp/api/feature.h \ + odp/api/hash.h \ + odp/api/hints.h \ odp/api/init.h \ odp/api/ipsec.h \ odp/api/pool.h \ odp/api/queue.h \ + odp/api/random.h \ odp/api/rwlock.h \ odp/api/rwlock_recursive.h \ odp/api/schedule.h \ @@ -24,7 +32,9 @@ odpapiinclude_HEADERS = \ odp/api/spinlock_recursive.h \ odp/api/std_clib.h \ odp/api/std_types.h \ + odp/api/support.h \ odp/api/sync.h \ + odp/api/system_info.h \ odp/api/thread.h \ odp/api/thrmask.h \ odp/api/ticketlock.h \ diff --git a/platform/linux-generic/include/odp/api/chksum.h b/include/odp/api/chksum.h similarity index 72% rename from platform/linux-generic/include/odp/api/chksum.h rename to include/odp/api/chksum.h index 18dcb6d11cb9..6dd1554ce48d 100644 --- a/platform/linux-generic/include/odp/api/chksum.h +++ b/include/odp/api/chksum.h @@ -10,21 +10,13 @@ * ODP checksum functions */ -#ifndef ODP_PLAT_CHKSUM_H_ -#define ODP_PLAT_CHKSUM_H_ +#ifndef ODP_API_CHKSUM_H_ +#define ODP_API_CHKSUM_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_chksum - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/compiler.h b/include/odp/api/compiler.h similarity index 69% rename from platform/linux-generic/include/odp/api/compiler.h rename to include/odp/api/compiler.h index 5249d5d6264b..04e815bb0fa5 100644 --- a/platform/linux-generic/include/odp/api/compiler.h +++ b/include/odp/api/compiler.h @@ -10,21 +10,13 @@ * Compiler related */ -#ifndef ODP_PLAT_COMPILER_H_ -#define ODP_PLAT_COMPILER_H_ +#ifndef ODP_API_COMPILER_H_ +#define ODP_API_COMPILER_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/include/odp/api/deprecated.h similarity index 82% rename from platform/linux-generic/include/odp/api/deprecated.h rename to include/odp/api/deprecated.h index 82797ebc4505..881f23d1975f 100644 --- a/platform/linux-generic/include/odp/api/deprecated.h +++ b/include/odp/api/deprecated.h @@ -10,8 +10,8 @@ * Control deprecated API definitions */ -#ifndef ODP_PLAT_DEPRECATED_H_ -#define ODP_PLAT_DEPRECATED_H_ +#ifndef ODP_API_DEPRECATED_H_ +#define ODP_API_DEPRECATED_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/errno.h b/include/odp/api/errno.h similarity index 83% rename from platform/linux-generic/include/odp/api/errno.h rename to include/odp/api/errno.h index f70d84df0112..420d5d078339 100644 --- a/platform/linux-generic/include/odp/api/errno.h +++ b/include/odp/api/errno.h @@ -10,14 +10,13 @@ * ODP errno API */ -#ifndef ODP_PLAT_ERRNO_H_ -#define ODP_PLAT_ERRNO_H_ +#ifndef ODP_API_ERRNO_H_ +#define ODP_API_ERRNO_H_ #ifdef __cplusplus extern "C" { #endif - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/feature.h b/include/odp/api/feature.h similarity index 71% rename from platform/linux-generic/include/odp/api/feature.h rename to include/odp/api/feature.h index 55a86a831084..6bbde3c3831a 100644 --- a/platform/linux-generic/include/odp/api/feature.h +++ b/include/odp/api/feature.h @@ -10,21 +10,13 @@ * ODP features. */ -#ifndef ODP_PLAT_FEATURE_H_ -#define ODP_PLAT_FEATURE_H_ +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_feature - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hash.h b/include/odp/api/hash.h similarity index 72% rename from platform/linux-generic/include/odp/api/hash.h rename to include/odp/api/hash.h index 332029ed0a24..8e1699ccce67 100644 --- a/platform/linux-generic/include/odp/api/hash.h +++ b/include/odp/api/hash.h @@ -10,21 +10,13 @@ * ODP Hash function */ -#ifndef ODP_PLAT_HASH_H_ -#define ODP_PLAT_HASH_H_ +#ifndef ODP_API_HASH_H_ +#define ODP_API_HASH_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_hash - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hints.h b/include/odp/api/hints.h similarity index 70% rename from platform/linux-generic/include/odp/api/hints.h rename to include/odp/api/hints.h index 3ba1ba95ed4f..c4d134b74818 100644 --- a/platform/linux-generic/include/odp/api/hints.h +++ b/include/odp/api/hints.h @@ -10,21 +10,13 @@ * ODP compiler hints */ -#ifndef ODP_PLAT_HINTS_H_ -#define ODP_PLAT_HINTS_H_ +#ifndef ODP_API_HINTS_H_ +#define ODP_API_HINTS_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/random.h b/include/odp/api/random.h similarity index 70% rename from platform/linux-generic/include/odp/api/random.h rename to include/odp/api/random.h index c8529b3f9b9a..4ce973840cd7 100644 --- a/platform/linux-generic/include/odp/api/random.h +++ b/include/odp/api/random.h @@ -10,21 +10,13 @@ * ODP random number API */ -#ifndef ODP_PLAT_RANDOM_H_ -#define ODP_PLAT_RANDOM_H_ +#ifndef ODP_API_RANDOM_H_ +#define ODP_API_RANDOM_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_random ODP RANDOM - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/support.h b/include/odp/api/support.h similarity index 73% rename from platform/linux-generic/include/odp/api/support.h rename to include/odp/api/support.h index dd6abab23a29..6c1759d4b8f6 100644 --- a/platform/linux-generic/include/odp/api/support.h +++ b/include/odp/api/support.h @@ -10,21 +10,13 @@ * ODP support API - platform specific header */ -#ifndef ODP_PLAT_SUPPORT_H_ -#define ODP_PLAT_SUPPORT_H_ +#ifndef ODP_API_SUPPORT_H_ +#define ODP_API_SUPPORT_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_support - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/system_info.h b/include/odp/api/system_info.h similarity index 82% rename from platform/linux-generic/include/odp/api/system_info.h rename to include/odp/api/system_info.h index 36ddc814b4c0..7b95a876affa 100644 --- a/platform/linux-generic/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -10,8 +10,8 @@ * ODP system information */ -#ifndef ODP_PLAT_SYSTEM_INFO_H_ -#define ODP_PLAT_SYSTEM_INFO_H_ +#ifndef ODP_API_SYSTEM_INFO_H_ +#define ODP_API_SYSTEM_INFO_H_ #ifdef __cplusplus extern "C" { @@ -19,7 +19,6 @@ extern "C" { #include - #include #ifdef __cplusplus diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3aee7ce6340e..14b449ea42c1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,24 +20,14 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/chksum.h \ include/odp/api/classification.h \ - include/odp/api/compiler.h \ include/odp/api/cpu.h \ include/odp/api/crypto.h \ include/odp/api/debug.h \ - include/odp/api/deprecated.h \ - include/odp/api/errno.h \ - include/odp/api/feature.h \ - include/odp/api/hash.h \ - include/odp/api/hints.h \ include/odp/api/packet_flags.h \ include/odp/api/packet.h \ include/odp/api/packet_io.h \ - include/odp/api/packet_io_stats.h \ - include/odp/api/random.h \ - include/odp/api/support.h \ - include/odp/api/system_info.h + include/odp/api/packet_io_stats.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \