From patchwork Thu Oct 26 12:00:00 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: 117198 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp676062qgn; Thu, 26 Oct 2017 05:03:22 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TX/ANhTeJE+2d0LJRP7N4fWfeJAouYoT9pN3HENoWqtKmwdyknTdji5rAuhFcPhwNzQGQe X-Received: by 10.55.201.135 with SMTP id m7mr7922654qkl.97.1509019402672; Thu, 26 Oct 2017 05:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509019402; cv=none; d=google.com; s=arc-20160816; b=KnfrPTzVhGjHROWLERZE23VrlZWx3MmjX0ImTY+g00P4aJteiEmyrhzZceRVOeu3nn ki9gdN15igiYlE0+9Z2DV3Y69+wIfsNr/xcbj/QXffBek8yZkAkLRz7A4jp4lZ9NpsLK 2OuAQehgxJLJ4JDtfloriQPyVvBuGIVekpOnNF3c//YjEdGjhOKOz5GpAK16d0QCvRDd bjrRK1e0IUMhZ40QPdmifMX7oj8U6KfUoTDKPsKaOUvKDO0v2JBDck3HQ5BDHzm4UNIo VtbB4eC8L1478S3te4+nvYCJw//ZFyWBJdwEXSvuAbcHghacXzw0eC7Gv3kS82wmF/wp 6tSA== 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=uzSTfCQwXEa0iMpeOelhwtCGujzC7iHcTVVU7nHv19Q=; b=hox8ekltDZEDH7gmuuiM1HalCq+LuJ/4eNEyr1xLkHZjj/zy70eKO/rQCpscG9oH78 jAiex3g/mYCpx+WNVFSeP9rYIdC7WmlXUi+LcFqvp/kq/3wojMGvOTkvw7Pp9dS4BPa7 tZ2ji6ZG4W1iqMOWqEpIP88NFFqYDiM5lpFV1gcMwaG3JQTq4wh3TiI3cFHy5+Ubq5Fy zR4u3GSVPXJENdCqa3T02blrbeDhyKpXwS4UjHH3TNf/p/qIgV+srnhzyhq/H09vSFvT f2gzOqnr2E3JGxaskrUeYvtOgSNxxUGRp8RgLpiSsd2L255t+VxjfhVGEfVIpFnip8VI clvw== 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 h93si4546546qkh.417.2017.10.26.05.03.22; Thu, 26 Oct 2017 05:03:22 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 442D962955; Thu, 26 Oct 2017 12:03:22 +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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 43D6E608D9; Thu, 26 Oct 2017 12:02:03 +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 0B7DD6073F; Thu, 26 Oct 2017 12:01:44 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 2F974608D9 for ; Thu, 26 Oct 2017 12:00:37 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward105j.mail.yandex.net (Yandex) with ESMTP id C58EC18738C for ; Thu, 26 Oct 2017 15:00:35 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Vd2eWlHYnx-0ZbioxaS; Thu, 26 Oct 2017 15:00:35 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5wmkfxbo1F-0YFu4Jro; Thu, 26 Oct 2017 15:00:34 +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: Thu, 26 Oct 2017 15:00:00 +0300 Message-Id: <1509019205-3327-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1509019205-3327-1-git-send-email-odpbot@yandex.ru> References: <1509019205-3327-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 261 Subject: [lng-odp] [PATCH 2.0 v1 1/6] linux-gen: modular-framework: make public modular framework headers 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 Make public modular framework headers. 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: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: 4a263f664ff0e7916e1fe52f09afeed0db9a11dc **/ frameworks/modular/module.h | 20 ++++++++++++++++ frameworks/modular/odp_module.c | 2 +- {frameworks/modular => include/odp/mf/spec}/list.h | 0 .../odp_module.h => include/odp/mf/spec/module.h | 0 include/odp_mf.h | 27 ++++++++++++++++++++++ platform/Makefile.inc | 5 ++++ platform/linux-dpdk/Makefile.am | 7 +++--- platform/linux-generic/Makefile.am | 7 +++--- 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 | 2 +- platform/linux-generic/pool/subsystem.c | 1 - platform/linux-generic/queue/subsystem.c | 1 - platform/linux-generic/schedule/subsystem.c | 1 - 17 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 frameworks/modular/module.h rename {frameworks/modular => include/odp/mf/spec}/list.h (100%) rename frameworks/modular/odp_module.h => include/odp/mf/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..f7445bef3 --- /dev/null +++ b/frameworks/modular/module.h @@ -0,0 +1,20 @@ +/* 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/frameworks/modular/list.h b/include/odp/mf/spec/list.h similarity index 100% rename from frameworks/modular/list.h rename to include/odp/mf/spec/list.h diff --git a/frameworks/modular/odp_module.h b/include/odp/mf/spec/module.h similarity index 100% rename from frameworks/modular/odp_module.h rename to include/odp/mf/spec/module.h diff --git a/include/odp_mf.h b/include/odp_mf.h new file mode 100644 index 000000000..f8998f280 --- /dev/null +++ b/include/odp_mf.h @@ -0,0 +1,27 @@ +/* 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/Makefile.inc b/platform/Makefile.inc index 4d9280b50..e6270f6cd 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -77,6 +77,11 @@ odpdrvspecinclude_HEADERS = \ $(top_srcdir)/include/odp/drv/spec/std_types.h \ $(top_srcdir)/include/odp/drv/spec/sync.h +odpmfspecincludedir= $(includedir)/odp/mf/spec +odpmfspecinclude_HEADERS = \ + $(top_srcdir)/include/odp/mf/spec/module.h \ + $(top_srcdir)/include/odp/mf/spec/list.h + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ $(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \ diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index c99cfaa1c..14bd1b866 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -19,7 +19,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 @@ -35,7 +34,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 = \ @@ -349,8 +349,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 277418142..e5a776a25 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -7,7 +7,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 @@ -25,7 +24,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 = \ @@ -373,8 +373,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..b8f6a6953 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..fe0efc40e 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..dc955e479 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..d73aa7345 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..650b7680a 100644 --- a/platform/linux-generic/include/odp_schedule_subsystem.h +++ b/platform/linux-generic/include/odp_schedule_subsystem.h @@ -19,7 +19,7 @@ extern "C" { #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",