From patchwork Fri Nov 10 17:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 118593 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp8165634qgn; Fri, 10 Nov 2017 09:01:21 -0800 (PST) X-Google-Smtp-Source: AGs4zMYZ5Yv55XfvGXGCLeVGkAwwkILAa7AKLGz+4cQc7LXjTgToa/Emlwp69lQaSUSZ8wvp/UBH X-Received: by 10.200.19.204 with SMTP id i12mr1626083qtj.211.1510333281032; Fri, 10 Nov 2017 09:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510333281; cv=none; d=google.com; s=arc-20160816; b=VWDjnWZVretGX313h3h7XBpEk4e1PZuKPfIEwjvAhVHWdQsy4L/XZTZNxvE+OBjFpR xWMmWCLFLnuMlEAAMiTOmd6WgcMjFAk0cY5GJpY90eg+kxB7JP4K3R/tTCrGmfruseWg s9boCniuA/zcF9rKmta/Jc9qmd40KLFT732q94hMo7xET834HLWncQpCliMmZIazj764 MKB6amxAM+t6YfUt7JucMg8e6NJZEQeekR4U+4TBQZ86bqtvBAq46Ds5iWQv57Jrf032 ThZtHBGRYLCoj0eiC6DLpfpJ9V1YD4DRAkoYr7hpjWR9f7ljO85iUS86bn8puuoA5l1/ 7dWQ== 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:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=HUB8J0i4AawORTIJjqPtgzKkrcIF2AlOIrqcJ/ErUMo=; b=tZ8Jw3L9qtcrHQt9pkUDBbkq8mCAxk0lPyKBfrqAIUTER1em++De+09s8/jXg6vr6P V+DMQvpNJM4MJGhHhzvJ1QH5p2TiZsM23IWCcPIH0n+Sk6FywMWSKQUxNxxNldkKw0FJ 9Vv5diBrdf2015xO+Hl5XaIV8DYQMWd9vXbHphSLsYQvwee7yVAdM4QHUhZNyisByv8E jsHnksCug+0uNUFuucwlERGtRKyJWTuU82TvvIB89n1cnTQySPJQ1Xh7acOBL2U8XLXO Am8dFgLMxWSsVg6rSLtDZc3oZcVxnaCXbK/Ramj/JMveWIL9AK6LaWOvw43DZifZc48U vQ0A== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 5si5686858qkf.210.2017.11.10.09.01.20; Fri, 10 Nov 2017 09:01:20 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A698160926; Fri, 10 Nov 2017 17:01:20 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 E7E2C605D7; Fri, 10 Nov 2017 17:00:33 +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 6DA2F605D7; Fri, 10 Nov 2017 17:00:26 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 773D6605D7 for ; Fri, 10 Nov 2017 17:00:21 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward101j.mail.yandex.net (Yandex) with ESMTP id BFEEA12444F6 for ; Fri, 10 Nov 2017 20:00:19 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id HdMmNAaY4L-0JBOscV0; Fri, 10 Nov 2017 20:00:19 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id cdbkjzjQmB-0IZiERiZ; Fri, 10 Nov 2017 20:00:19 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 10 Nov 2017 20:00:12 +0300 Message-Id: <1510333217-26418-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510333217-26418-1-git-send-email-odpbot@yandex.ru> References: <1510333217-26418-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 261 Subject: [lng-odp] [PATCH 2.0 v2 1/6] linux-gen: modular-framework: move modular framework headers to a public folder 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" From: Bogdan Pricope Move modular framework headers to a public folder. Signed-off-by: Bogdan Pricope --- /** Email created from pull request 261 (bogdanPricope:2_0_mf_include_pr) ** https://github.com/Linaro/odp/pull/261 ** Patch: https://github.com/Linaro/odp/pull/261.patch ** Base sha: 65419c16086369f86dea068e54ce492526fa4f41 ** Merge commit sha: 3034b865079536d2064a7ceb890b5bf6876949a6 **/ frameworks/modular/module.h | 19 ++++++++++++++++ frameworks/modular/odp_module.c | 2 +- include/Makefile.am | 8 ++++++- .../frameworks/modular/spec}/list.h | 0 .../frameworks/modular/spec/module.h | 0 include/odp_mf.h | 26 ++++++++++++++++++++++ platform/linux-dpdk/Makefile.am | 7 +++--- platform/linux-generic/Makefile.am | 4 +--- platform/linux-generic/buffer/subsystem.c | 1 - .../linux-generic/include/odp_buffer_subsystem.h | 2 +- .../include/odp_pktio_ops_subsystem.h | 2 +- .../linux-generic/include/odp_pool_subsystem.h | 2 +- .../linux-generic/include/odp_queue_subsystem.h | 2 +- .../linux-generic/include/odp_schedule_subsystem.h | 4 +--- platform/linux-generic/pool/subsystem.c | 1 - platform/linux-generic/queue/subsystem.c | 1 - platform/linux-generic/schedule/subsystem.c | 1 - 17 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 frameworks/modular/module.h rename {frameworks/modular => include/frameworks/modular/spec}/list.h (100%) rename frameworks/modular/odp_module.h => include/frameworks/modular/spec/module.h (100%) create mode 100644 include/odp_mf.h diff --git a/frameworks/modular/module.h b/frameworks/modular/module.h new file mode 100644 index 000000000..866a89b7d --- /dev/null +++ b/frameworks/modular/module.h @@ -0,0 +1,19 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_CORE_MODULE_H_ +#define ODP_CORE_MODULE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#ifdef __cplusplus +} +#endif +#endif /* ODP_CORE_MODULE_H_ */ diff --git a/frameworks/modular/odp_module.c b/frameworks/modular/odp_module.c index 475bcd5e2..596befd55 100644 --- a/frameworks/modular/odp_module.c +++ b/frameworks/modular/odp_module.c @@ -10,7 +10,7 @@ #include #include -#include "odp_module.h" +#include "module.h" #define MODULE_FRAMEWORK_VERSION 0x00010000UL ODP_SUBSYSTEM_DEFINE(module, "module framework", MODULE_FRAMEWORK_VERSION); diff --git a/include/Makefile.am b/include/Makefile.am index 376916723..1aeec1c72 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,8 @@ include_HEADERS = \ odp.h \ odp_api.h \ - odp_drv.h + odp_drv.h \ + odp_mf.h odpapispecincludedir= $(includedir)/odp/api/spec odpapispecinclude_HEADERS = \ @@ -68,6 +69,11 @@ odpdrvspecinclude_HEADERS = \ odp/drv/spec/std_types.h \ odp/drv/spec/sync.h +frameworksmodularspecincludedir= $(includedir)/frameworks/modular/spec +frameworksmodularspecinclude_HEADERS = \ + frameworks/modular/spec/module.h \ + frameworks/modular/spec/list.h + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/buffer.h \ diff --git a/frameworks/modular/list.h b/include/frameworks/modular/spec/list.h similarity index 100% rename from frameworks/modular/list.h rename to include/frameworks/modular/spec/list.h diff --git a/frameworks/modular/odp_module.h b/include/frameworks/modular/spec/module.h similarity index 100% rename from frameworks/modular/odp_module.h rename to include/frameworks/modular/spec/module.h diff --git a/include/odp_mf.h b/include/odp_mf.h new file mode 100644 index 000000000..f29ae6cee --- /dev/null +++ b/include/odp_mf.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * The OpenDataPlane modular framework programming interface + * + */ + +#ifndef ODP_MF_H_ +#define ODP_MF_H_ + +#ifdef __cplusplus +extern C { +#endif + +#include + +#ifdef __cplusplus +} +#endif +#endif /* ODP_MF_H_ */ diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index f27d2b50c..aa7990873 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -22,7 +22,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-dpdk/include AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-generic/include AM_CPPFLAGS += -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/frameworks/modular AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude @@ -38,7 +37,8 @@ AM_CPPFLAGS += $(LIBCONFIG_CFLAGS) include_HEADERS = \ $(top_srcdir)/include/odp.h \ $(top_srcdir)/include/odp_api.h \ - $(top_srcdir)/include/odp_drv.h + $(top_srcdir)/include/odp_drv.h \ + $(top_srcdir)/include/odp_mf.h odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ @@ -355,8 +355,7 @@ endif # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular -noinst_HEADERS += $(modularframeworkdir)/list.h \ - $(modularframeworkdir)/odp_module.h +noinst_HEADERS += $(modularframeworkdir)/module.h __LIB__libodp_dpdk_la_SOURCES += ../../frameworks/modular/odp_module.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3c5054958..afbb0edba 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -10,7 +10,6 @@ lib_LTLIBRARIES = $(LIB)/libodp-linux.la AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/frameworks/modular AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude @@ -377,8 +376,7 @@ endif # Build modular framework into odp-linux library modularframeworkdir = $(top_srcdir)/frameworks/modular -noinst_HEADERS += $(modularframeworkdir)/list.h \ - $(modularframeworkdir)/odp_module.h +noinst_HEADERS += $(modularframeworkdir)/module.h __LIB__libodp_linux_la_SOURCES += ../../frameworks/modular/odp_module.c diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c index d47525cf9..767113975 100644 --- a/platform/linux-generic/buffer/subsystem.c +++ b/platform/linux-generic/buffer/subsystem.c @@ -8,7 +8,6 @@ #include #include #include -#include ODP_SUBSYSTEM_DEFINE(buffer, "memory buffer public APIs", BUFFER_SUBSYSTEM_VERSION); diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/platform/linux-generic/include/odp_buffer_subsystem.h index 3c791d207..35b2a06e1 100644 --- a/platform/linux-generic/include/odp_buffer_subsystem.h +++ b/platform/linux-generic/include/odp_buffer_subsystem.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include +#include #include #define BUFFER_SUBSYSTEM_VERSION 0x00010000UL diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index cb107fed2..58622ff12 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include +#include #include /* ODP packet IO operations subsystem declaration */ diff --git a/platform/linux-generic/include/odp_pool_subsystem.h b/platform/linux-generic/include/odp_pool_subsystem.h index 0f34ad143..0181b74e9 100644 --- a/platform/linux-generic/include/odp_pool_subsystem.h +++ b/platform/linux-generic/include/odp_pool_subsystem.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include +#include #include /* ODP pool public APIs subsystem */ diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/platform/linux-generic/include/odp_queue_subsystem.h index 57fa68fdb..72aeebd80 100644 --- a/platform/linux-generic/include/odp_queue_subsystem.h +++ b/platform/linux-generic/include/odp_queue_subsystem.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include +#include #include #define QUEUE_SUBSYSTEM_VERSION 0x00010000UL diff --git a/platform/linux-generic/include/odp_schedule_subsystem.h b/platform/linux-generic/include/odp_schedule_subsystem.h index 7d9247788..74bff97f0 100644 --- a/platform/linux-generic/include/odp_schedule_subsystem.h +++ b/platform/linux-generic/include/odp_schedule_subsystem.h @@ -17,9 +17,7 @@ extern "C" { /* API header files */ #include #include - -/* Internal header files */ -#include +#include #define SCHEDULE_SUBSYSTEM_VERSION 0x00010000UL diff --git a/platform/linux-generic/pool/subsystem.c b/platform/linux-generic/pool/subsystem.c index c5f644912..073a9fa98 100644 --- a/platform/linux-generic/pool/subsystem.c +++ b/platform/linux-generic/pool/subsystem.c @@ -9,7 +9,6 @@ #include #include #include -#include #define SUBSYSTEM_VERSION 0x00010000UL ODP_SUBSYSTEM_DEFINE(pool, "memory pool public APIs", SUBSYSTEM_VERSION); diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c index 5a88b2df9..05e8edb8e 100644 --- a/platform/linux-generic/queue/subsystem.c +++ b/platform/linux-generic/queue/subsystem.c @@ -12,7 +12,6 @@ #include #include #include -#include ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION); diff --git a/platform/linux-generic/schedule/subsystem.c b/platform/linux-generic/schedule/subsystem.c index ba9a095f4..99c6141c2 100644 --- a/platform/linux-generic/schedule/subsystem.c +++ b/platform/linux-generic/schedule/subsystem.c @@ -14,7 +14,6 @@ /* Internal header files */ #include #include -#include #include ODP_SUBSYSTEM_DEFINE(schedule, "schedule public APIs",