From patchwork Wed Jul 3 08:00:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1589 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 86C5461571 for ; Wed, 3 Jul 2019 10:00:25 +0200 (CEST) Received: from neptunite.flets-east.jp (p1871204-ipngn14001hodogaya.kanagawa.ocn.ne.jp [153.220.127.204]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B29724B; Wed, 3 Jul 2019 10:00:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1562140825; bh=GiboB/+QpkhPSmGFFg6QBKda2DvHAu7MkYk3Dk9gck4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXaQMmgObPqSnD9irTYcpYbAEsHYCBOVnluF1EhZb/JqgoQ3NuLBmrqg5gBkV3O/k 8lV6cyJNN03Q+hUDbs3fGG94dqE+47oE9JPGoksWxXhvbw+4byUtSpUPjC2jfw3Hrp y2TrbSaxMtTuigTkgThddYX4yEhiUB1UXnB29LOc= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 3 Jul 2019 17:00:01 +0900 Message-Id: <20190703080007.21376-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703080007.21376-1-paul.elder@ideasonboard.com> References: <20190703080007.21376-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 1/7] libcamera: ipa_module_info: add license field X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 08:00:25 -0000 Add a field to IPAModuleInfo to contain the license of the module. Update the dummy IPA and IPA test to conform to the new struct layout Signed-off-by: Paul Elder --- New patch in v2 - this replaces the isolate flag that was used in v1 include/libcamera/ipa/ipa_module_info.h | 2 ++ src/ipa/ipa_dummy.cpp | 1 + src/libcamera/ipa_module.cpp | 3 +++ test/ipa/ipa_test.cpp | 1 + 4 files changed, 7 insertions(+) diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 585f753..39dca1a 100644 --- a/include/libcamera/ipa/ipa_module_info.h +++ b/include/libcamera/ipa/ipa_module_info.h @@ -18,6 +18,8 @@ struct IPAModuleInfo { uint32_t pipelineVersion; char pipelineName[256]; char name[256]; + char license[64]; + } __attribute__((packed)); extern "C" { diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp index ee7a3a8..2e6ff71 100644 --- a/src/ipa/ipa_dummy.cpp +++ b/src/ipa/ipa_dummy.cpp @@ -34,6 +34,7 @@ const struct IPAModuleInfo ipaModuleInfo = { 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", + "LGPLv2.1", }; IPAInterface *ipaCreate() diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index d82ac69..f786c16 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -215,6 +215,9 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol) * * \var IPAModuleInfo::name * \brief The name of the IPA module + * + * \var IPAModuleInfo::license + * \brief License of the IPA module */ /** diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp index bbef069..4c51034 100644 --- a/test/ipa/ipa_test.cpp +++ b/test/ipa/ipa_test.cpp @@ -59,6 +59,7 @@ protected: 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", + "LGPLv2.1" }; count += runTest("src/ipa/ipa_dummy.so", testInfo);