From patchwork Tue Oct 6 09:36:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 54522 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 4E5D622FC5 for ; Tue, 6 Oct 2015 09:36:43 +0000 (UTC) Received: by wisv5 with SMTP id v5sf39262616wis.0 for ; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=cUyEdhH3xAW83O6/Nztr5xyfvk+71GJETnal6tW7CQM=; b=Ld5Jji2Wg+3cBfX3BmDYIne+N1Fdm1lB1wb3seJumSgd6MRbZc0+MnmJObF4JUzPrj k/Sb5mNRRDcZeIwvy0QwExS40kWYC7AISOXWEpHv4/5JkYH+AwyYxsJNyWIK7VxmoGdS AmBnPY8LWlSv3a+aC279sPzWHO3FU9pc5+Qhbl3SGltwFZLzZG1XKX0VRGH6tVXdTlUc K94a45JPjpDKTEALnQm4KszLEByqXd03I2pWMfqKZBG5LBMf0Hor+btBaH0wWa5BRNz4 fE7vilXKsURFwJHWcD5FsL0fLGgwdq63vB+oxX+UATb9jiDY33C0sWqH4sHvh0NgEnpF rmmw== X-Gm-Message-State: ALoCoQkXmKgwcjxZUM0DludZmEmjWxd4ieQ1XuCzu10ATSs7rNj5rivy14Ljqx1o4ogaVNvNCawz X-Received: by 10.194.156.193 with SMTP id wg1mr6204457wjb.3.1444124202632; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.207.70 with SMTP id f67ls504609lfg.78.gmail; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) X-Received: by 10.112.159.136 with SMTP id xc8mr9822741lbb.76.1444124202477; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id 67si20273426lfq.17.2015.10.06.02.36.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 02:36:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbos8 with SMTP id s8so72677136lbo.0 for ; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) X-Received: by 10.25.40.130 with SMTP id o124mr8990064lfo.41.1444124202205; Tue, 06 Oct 2015 02:36:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1737769lbq; Tue, 6 Oct 2015 02:36:41 -0700 (PDT) X-Received: by 10.107.38.210 with SMTP id m201mr38574670iom.98.1444124201092; Tue, 06 Oct 2015 02:36:41 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 39si21816194iop.174.2015.10.06.02.36.40; Tue, 06 Oct 2015 02:36:41 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id 2690561A16; Tue, 6 Oct 2015 09:36:40 +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, RCVD_IN_DNSWL_LOW, 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 56C056198B; Tue, 6 Oct 2015 09:36:34 +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 6734F61A07; Tue, 6 Oct 2015 09:36:32 +0000 (UTC) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by lists.linaro.org (Postfix) with ESMTPS id 52C496197A for ; Tue, 6 Oct 2015 09:36:31 +0000 (UTC) Received: by lbcao8 with SMTP id ao8so72769023lbc.3 for ; Tue, 06 Oct 2015 02:36:29 -0700 (PDT) X-Received: by 10.25.165.4 with SMTP id o4mr9141374lfe.4.1444124189561; Tue, 06 Oct 2015 02:36:29 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id k19sm5120217lfg.8.2015.10.06.02.36.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Oct 2015 02:36:28 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 6 Oct 2015 12:36:27 +0300 Message-Id: <1444124187-3686-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] move odph_pause inside linux-generic X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Move odph_pause inside linux-generic. Validation test is also useless with such move. Signed-off-by: Maxim Uvarov --- helper/Makefile.am | 4 +--- helper/ring.c | 2 +- helper/test/Makefile.am | 4 +--- helper/test/odph_pause.c | 14 -------------- platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_pause_internal.h | 4 ++-- 6 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 helper/test/odph_pause.c rename helper/odph_pause.h => platform/linux-generic/include/odp_pause_internal.h (93%) diff --git a/helper/Makefile.am b/helper/Makefile.am index 1a74e8e..cde8af2 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,9 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/udp.h -noinst_HEADERS = \ - $(srcdir)/odph_debug.h \ - $(srcdir)/odph_pause.h +noinst_HEADERS = $(srcdir)/odph_debug.h __LIB__libodphelper_la_SOURCES = \ linux.c \ diff --git a/helper/ring.c b/helper/ring.c index 844abf7..6bb2bda 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -71,7 +71,7 @@ #include #include -#include "odph_pause.h" +#include "odp_pause_internal.h" #include #include #include diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fbf5a9b..7b73602 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -7,8 +7,7 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = odp_chksum$(EXEEXT) \ odp_thread$(EXEEXT) \ - odp_process$(EXEEXT)\ - odph_pause$(EXEEXT) + odp_process$(EXEEXT) COMPILE_ONLY = @@ -28,4 +27,3 @@ dist_odp_thread_SOURCES = odp_thread.c odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la dist_odp_process_SOURCES = odp_process.c odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la -odph_pause_SOURCES = odph_pause.c diff --git a/helper/test/odph_pause.c b/helper/test/odph_pause.c deleted file mode 100644 index f5f5da3..0000000 --- a/helper/test/odph_pause.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include "../odph_pause.h" - -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) -{ - odph_pause(); - return 0; -} diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4c79730..b9ed3b0 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -128,6 +128,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_packet_io_queue.h \ ${srcdir}/include/odp_packet_socket.h \ + ${srcdir}/include/odp_pause_internal.h \ ${srcdir}/include/odp_pool_internal.h \ ${srcdir}/include/odp_queue_internal.h \ ${srcdir}/include/odp_schedule_internal.h \ diff --git a/helper/odph_pause.h b/platform/linux-generic/include/odp_pause_internal.h similarity index 93% rename from helper/odph_pause.h rename to platform/linux-generic/include/odp_pause_internal.h index 5618f1f..ad2c628 100644 --- a/helper/odph_pause.h +++ b/platform/linux-generic/include/odp_pause_internal.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODPH_PAUSE_H_ -#define ODPH_PAUSE_H_ +#ifndef ODP_PAUSE_INTERNAL_H_ +#define ODP_PAUSE_INTERNAL_H_ #ifdef __cplusplus extern "C" {