From patchwork Fri Aug 6 10:14:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13245 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 69871C3239 for ; Fri, 6 Aug 2021 10:14:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7A7916881B; Fri, 6 Aug 2021 12:14:33 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="sZN8/z2w"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7FD4860266 for ; Fri, 6 Aug 2021 12:14:32 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.40]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 55D3F4FB; Fri, 6 Aug 2021 12:14:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1628244872; bh=5u1cOL82emyi+LHxG+VQn5VpjZKhwzSK2TY8pTTSc6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sZN8/z2wLXm7sSTTznKVH2i1N4jEGe+0gx0lNiCCmTfgx4QTma2HdRw9QtYMwtO35 LinhWi01rau02ufVm3AbIcpzk8sXnRbXQ+7bwDilD+TmEtvYUON7yZ0zb7ZYhW6PlR N2dIk1DSrDrMDov6Edacm/l49guKlLX1sasrdtbI= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Fri, 6 Aug 2021 15:44:07 +0530 Message-Id: <20210806101409.324645-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806101409.324645-1-umang.jain@ideasonboard.com> References: <20210806101409.324645-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/4] ipa: vimc: Rename IPA trace enums X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" To avoid the conflict of naming with IPAOperations in future, rename trace enum to IPATrace*. This commit does not introduce any functional changes. Signed-off-by: Umang Jain --- include/libcamera/ipa/vimc.mojom | 10 +++++----- src/ipa/vimc/vimc.cpp | 10 +++++----- test/ipa/ipa_interface_test.cpp | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom index ee66353d..99b6412b 100644 --- a/include/libcamera/ipa/vimc.mojom +++ b/include/libcamera/ipa/vimc.mojom @@ -10,11 +10,11 @@ import "include/libcamera/ipa/core.mojom"; const string VimcIPAFIFOPath = "/tmp/libcamera_ipa_vimc_fifo"; -enum IPAOperationCode { - IPAOperationNone, - IPAOperationInit, - IPAOperationStart, - IPAOperationStop, +enum IPATraceCode { + IPATraceNone, + IPATraceInit, + IPATraceStart, + IPATraceStop, }; interface IPAVimcInterface { diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index fb134084..54d9086a 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -40,7 +40,7 @@ public: private: void initTrace(); - void trace(enum ipa::vimc::IPAOperationCode operation); + void trace(enum ipa::vimc::IPATraceCode operation); int fd_; }; @@ -59,7 +59,7 @@ IPAVimc::~IPAVimc() int IPAVimc::init(const IPASettings &settings) { - trace(ipa::vimc::IPAOperationInit); + trace(ipa::vimc::IPATraceInit); LOG(IPAVimc, Debug) << "initializing vimc IPA with configuration file " @@ -76,7 +76,7 @@ int IPAVimc::init(const IPASettings &settings) int IPAVimc::start() { - trace(ipa::vimc::IPAOperationStart); + trace(ipa::vimc::IPATraceStart); LOG(IPAVimc, Debug) << "start vimc IPA!"; @@ -85,7 +85,7 @@ int IPAVimc::start() void IPAVimc::stop() { - trace(ipa::vimc::IPAOperationStop); + trace(ipa::vimc::IPATraceStop); LOG(IPAVimc, Debug) << "stop vimc IPA!"; } @@ -117,7 +117,7 @@ void IPAVimc::initTrace() fd_ = ret; } -void IPAVimc::trace(enum ipa::vimc::IPAOperationCode operation) +void IPAVimc::trace(enum ipa::vimc::IPATraceCode operation) { if (fd_ < 0) return; diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index ee9f2651..2f30b26a 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -34,7 +34,7 @@ class IPAInterfaceTest : public Test, public Object { public: IPAInterfaceTest() - : trace_(ipa::vimc::IPAOperationNone), notifier_(nullptr), fd_(-1) + : trace_(ipa::vimc::IPATraceNone), notifier_(nullptr), fd_(-1) { } @@ -112,10 +112,10 @@ protected: } timer.start(1000); - while (timer.isRunning() && trace_ != ipa::vimc::IPAOperationInit) + while (timer.isRunning() && trace_ != ipa::vimc::IPATraceInit) dispatcher->processEvents(); - if (trace_ != ipa::vimc::IPAOperationInit) { + if (trace_ != ipa::vimc::IPATraceInit) { cerr << "Failed to test IPA initialization sequence" << endl; return TestFail; @@ -124,10 +124,10 @@ protected: /* Test start of IPA module. */ ipa_->start(); timer.start(1000); - while (timer.isRunning() && trace_ != ipa::vimc::IPAOperationStart) + while (timer.isRunning() && trace_ != ipa::vimc::IPATraceStart) dispatcher->processEvents(); - if (trace_ != ipa::vimc::IPAOperationStart) { + if (trace_ != ipa::vimc::IPATraceStart) { cerr << "Failed to test IPA start sequence" << endl; return TestFail; } @@ -135,10 +135,10 @@ protected: /* Test stop of IPA module. */ ipa_->stop(); timer.start(1000); - while (timer.isRunning() && trace_ != ipa::vimc::IPAOperationStop) + while (timer.isRunning() && trace_ != ipa::vimc::IPATraceStop) dispatcher->processEvents(); - if (trace_ != ipa::vimc::IPAOperationStop) { + if (trace_ != ipa::vimc::IPATraceStop) { cerr << "Failed to test IPA stop sequence" << endl; return TestFail; } @@ -161,7 +161,7 @@ private: cerr << "Failed to read from IPA test FIFO at '" << ipa::vimc::VimcIPAFIFOPath << "': " << strerror(ret) << endl; - trace_ = ipa::vimc::IPAOperationNone; + trace_ = ipa::vimc::IPATraceNone; } } @@ -170,7 +170,7 @@ private: std::shared_ptr pipe_; std::unique_ptr ipa_; std::unique_ptr ipaManager_; - enum ipa::vimc::IPAOperationCode trace_; + enum ipa::vimc::IPATraceCode trace_; EventNotifier *notifier_; int fd_; };