From patchwork Wed Apr 27 22:30:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15740 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 02396C326C for ; Wed, 27 Apr 2022 22:30:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3C03E65646; Thu, 28 Apr 2022 00:30:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651098614; bh=ATeKyqRnHw9iVa0bTgA+UNdA5iARog/YOYpAYY2+Gv0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=BhhAxkLeCrnrYs9uGNkiFPpK7iwFNFIEUP6kuGyh0q3fGLW8+3fA2MmeySUxvHwWJ Mwdghkf0Z0K8gapZeLREr0X2wgNhRHMFu74LcIgfPCeMV9FFXq2ZERR1/P3CXXfxKq kxkwhP3eubGkcuEowGAvGEKju733+R9UI2ZnUkE7CHUC2q4Sm1w9TO8qjLCbzrsPay ohM2Mg6PQM/5POqaSgzZYBsTmGrMCi5z0F2iEwUjM31kXa5sm6/Z+JMPRf4Cm4lrR7 xvk277JeBMobVYaAu48BS/W8pOSLi4A1/ng/i1J070MhMoE3KZ8vxxz0+lYPqm3Xxl 1mBkzASPya9jw== Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B71B865640 for ; Thu, 28 Apr 2022 00:30:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="cKLHBH3h"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1651098608; bh=ATeKyqRnHw9iVa0bTgA+UNdA5iARog/YOYpAYY2+Gv0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=cKLHBH3hrmD70hTOBSfWv6x3nToknYK/IvBXlwP0A1ahfcCrHeJjHZdLy6gGyxRx1 6VrWW3FcHoqPc0ZVpwp3d9/PaAS5ydHtsAM6moiaBccmP9NdlCL6Y7QOTtqzKGy5lL ECqMCzmPZX+WjElJMfpZ7ogf7Bxd2kwDvY9X8aJ8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.10.251.63]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M26vB-1nhNCA3jYn-002aDT; Thu, 28 Apr 2022 00:30:08 +0200 To: libcamera-devel@lists.libcamera.org Date: Wed, 27 Apr 2022 23:30:03 +0100 Message-Id: <20220427223004.115381-4-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220427223004.115381-1-Rauch.Christian@gmx.de> References: <20220427223004.115381-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:3vcZya9a+160FgsbefgoiRlIM6tgXwRG6JmcapPdvInDwqXaDcz dROUVU/HPyLofMjfuGQUJS6vGzqI49w0Pygh8LuD6LXGmyagki070NAqny8SVSlZH3c+T0w YzUZmC1EPwPH/RPz6Ii6Id/di+hVWOZMDFEkk3jMNQqFCySqr3QEpJ941LDar6JG7KI6O8E 66bD4XVOMuzFcyulT4r0Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:zauLqDbqV4s=:cr4S0LIwk5yASanFgJNatK IC81Es+amu8TGiNTysMuofKXHAnGYG7NofIyTb34Y1v+pq0DfbQbrFE1bGGVhNDCZ7oqWdVXA S1eEus62cu+w1WGWe5phOoO6tNcTf4w4u75LESRr7miLaUyrrl0LQkTZlUe7US+U/xNFA5XhV ccpZu59lZefDXnNTqoHbEoNSgHvwPQ9I2hxuzrMxp28QcXzsocVwFKSrDiZ3wc2TeshXlgAtp F8JcrJbVRy6RuF2tNW6N01IkZs2akLuPDdFmIGi7ES0izFpSn5VciHcCSiwvwwiPMy9oP2aT7 MwHYr4hXhuyx4X6L7b2Kv8Edp/8ce4zgk/OUo7WKScgWWhmWVz+VToAZxqQR6WJbUe10327mU QhW5aoDakulyOIJefNGGAs8v3KPBasiw1+ZhfbseDVUjjzl924xMQ+HXUQIfRvRsxP/PZ6aTH 0kau6jXmb5FtskUT9jYZQDViU3ouKUkKA91zGebJORkVgSsk+zE3r9aCiKlbEeF1pEO8MWgiX rK6FmE2Q6tAZ2L6r3B4XVUdHVccaPt4CpIN8hvMPxW2lsAl6zhkcAnpDllpuL2jKzamOWW3Ro 42wJ9hGFC6XNGDYZcAVSBEYdsZKBoDS4YirWUMhYwVx0XNDmf2uzzLDxG7+bozNWW9K3QEJIR kzFbXqnfIQ90Cwe+rDjmWFMh9WNLGDL2KC/bbSeMhMbpDwCC4UUOqn9D++d6GM6PBZCKDSQ7w QANN6nhTGXK8P88urFzWZ8TpIGWv3dtOixmzN0sSNjon26xOMj18mG/uCI+CZQLHrc5lhUR3A drd0SaW0jil49loUoX63kkrIyoqO99KUtjU99WBgO4bTqmj2ueg5q6SNb2u/fLpJ4YrOrTKP2 JCOehw0FnZPauCln//gCUxOPCzbsaCJDArWTHsKHVXtQnHU6gguGExC+/iVLn1XNdezgsrxsb dvcs0GnmvmSjxYHJWgodkl1nHVESnCI59BoWkCtu+pr5mBsN8woqmbEoMxmLTZ4PWpgn0n19y MUBbiZ6c3/qhcKVWepV3gGFUIf6Pii5rAFOHL32z8kM8X4mtTCu8pX0prcznkju2rcMiVibgG cJS1HI4+fpI/BA= Subject: [libcamera-devel] [PATCH v4 3/4] generate fixed- and variable-sized Span Controls 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: , X-Patchwork-Original-From: Christian Rauch via libcamera-devel From: Christian Rauch Reply-To: Christian Rauch Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This defines Controls with a 'size' as either variable-sized Span or as fixed-sized Span. Signed-off-by: Christian Rauch --- utils/gen-controls.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) -- 2.34.1 diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 3f99b5e2..c9e79a22 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -7,6 +7,7 @@ # gen-controls.py - Generate control definitions from YAML import argparse +import math import string import sys import yaml @@ -22,6 +23,25 @@ def format_description(description): return '\n'.join([(line and ' * ' or ' *') + line for line in description]) +def get_ctrl_type(ctrl): + ctrl_type = ctrl['type'] + ctrl_size_arr = ctrl.get('size') + ctrl_is_span = ctrl_size_arr is not None + + if ctrl_type == 'string': + return 'std::string' + elif ctrl_is_span: + ctrl_span_size = math.prod(ctrl_size_arr) if len(ctrl_size_arr) > 0 else None + if ctrl_span_size: + # fixed-sized Span + return f"Span" + else: + # variable-sized Span + return f"Span" + else: + return ctrl_type + + def generate_cpp(controls): enum_doc_start_template = string.Template('''/** * \\enum ${name}Enum @@ -50,11 +70,7 @@ ${description} name, ctrl = ctrl.popitem() id_name = snake_case(name).upper() - ctrl_type = ctrl['type'] - if ctrl_type == 'string': - ctrl_type = 'std::string' - elif ctrl.get('size'): - ctrl_type = 'Span' % ctrl_type + ctrl_type = get_ctrl_type(ctrl) info = { 'name': name, @@ -135,11 +151,7 @@ def generate_h(controls): ids.append('\t' + id_name + ' = ' + str(id_value) + ',') - ctrl_type = ctrl['type'] - if ctrl_type == 'string': - ctrl_type = 'std::string' - elif ctrl.get('size'): - ctrl_type = 'Span' % ctrl_type + ctrl_type = get_ctrl_type(ctrl) info = { 'name': name,