From patchwork Fri Apr 1 00:06:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15605 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 D0058C3265 for ; Fri, 1 Apr 2022 00:06:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 73ECA65641; Fri, 1 Apr 2022 02:06:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648771607; bh=LPPdeQdJbsck3dbM0H669GulrtDx8tgII4gP48FnFPQ=; 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=mGGjf5D3U5dodLhtbyV4Q5Ty5ceqjpz8kAYRIuIMaLluFbDxht8J5B2wVk7wgZZ+g yH6ygfVEkHwbtZb66dPrsYqRCj2KaHRPE23AfqtjIp6AJ/IwLP1D3TXFjcE3eyErDa 8b1V6H5HtexggseGc33XCdmfFUOPBPcCmoFmh9PrhTjcjy0PtRPYHUf6lgJZxbusDw m0wTZWHGdW5Tj/u5RToDIYYZ8Us7pGhjHQhi4zyUN9vTzCNZgSmtK9nOACcWPeo+bv qi9SbjcMey1GBUBBlWVhrrF1tZeSUnBYb6uCOFgHANNBdoR6e/RxUvy/uhtPAzs8Rx PIZ8Ca4Juu1jA== Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8F3B660135 for ; Fri, 1 Apr 2022 02:06:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="hAoJZsMZ"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648771605; bh=LPPdeQdJbsck3dbM0H669GulrtDx8tgII4gP48FnFPQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hAoJZsMZfONdEhCT+xug+y7eL2az2jmeo7XG9Ywl9tGRMl1fEtMze2x3/f79vClzK DGL2OLcdEVYi/gJYzP+EEiwQx7ZDBRBbZPDSOmAStHzMhEK4x+Z3eYET+czU3+tmkJ dhzKDH4ttF7bEBPJnp3wJwYONiGWt86fumW+SjT8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.10.251.63]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MuDc7-1nt8Mi0LQj-00udf7; Fri, 01 Apr 2022 02:06:45 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 1 Apr 2022 01:06:13 +0100 Message-Id: <20220401000616.12976-3-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401000616.12976-1-Rauch.Christian@gmx.de> References: <20220401000616.12976-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:pjquAJgGrAojuXgsCfZezU4cJ5Y4vD8gFPSydcXosmIjWmYSmgL wvsf4Nouc0N+J36r7vCUb5ZPB53G4CuweJ3qbL5wiJRBq3jgkBAZp/UxN/QVs3I7CK1AI5r MBKHnxc3AYgVp+6o25LO/iRtvxqvsH10PSZG7HyfWK30lKjl2n6QoE990JIXfkLzwmznPUF USzdlmvbCBfGubjyddr9A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:tY5BXCb8rQs=:QBNqE8PoEStqotT9DWAfuM cSjcRf7+ZTunkXKQSmaDs8HAuIGN8loavyGbJzCx4O1qXWeGiZedkJ5dK2SoyNsvuVt6AqOZy kSnaH8moO91yHL9wCrYG9Mdqz+d5Sjxbrwx/sny83JO/806qRdPtTuNRvL5xS7Wnz8IeF8jVn 2ILHFEnNgiOxMLQnWxaQhx1rSsIfvR2CpkPuEBShoKMmEck9zc/mIkqql4y3FCXQFTO/qAMXD aQsB8TY6xAzzQEoxPlMxoaGJY4d1mJ3AGG2AxDScqfQ8Gspd8v9tnIZzAQv73gfq6KsSu+AEo uTyVgAL7Bcdt+0T2MK/7sFWEqrXYrR1wjtvTE6aEWMzJtxEymj/27ZNCZgt1Xlo//7nbCQ0HV ydoSyoMN0z1/Tuqt5rfdf9a8jm2mu8eZIMxuBiWKtzCspjX5GrtgpHDX97ZzHYugqa9sSromD D1CWr9cmzLcynKnbrO9p6XqQhsBEYkLO1DwArnbwOyCUEySAqJlhGRM5W33AHOV6iVUw6+/v5 qPikoOpMSy3rB2vPiurHQTC22zuMsJVDfHHh9iGOMsMVWKYrNtRLMZUx3eWBja+drc1vmhsvR 9HYHskmDyttFbHPyqKOKlT3e0DUiZ3furtty07MxSE8WwPeSl9ABoxwRK+jtU9LywmlRDg5qV HkSH9bEC+FdUYG+Npn73M2K04qGSWY9uB0KkQW0eUdpM4GN5CY6IuO0v/qqGjPW07D2qZ6kVh IWfsQWfhHlASlnOsM3Vvu6fYJUmi9fq0S3wuPVjdiMOIoMm1jxSPJRTTBQAVkxJNCFWmt19Ew UiWt91c5q1EnOtlEhDlf2ynyKKuCRsfScDW3RSACU3SIrrgsDeaAzeoBi0isLWPJ3N/BjdtbQ cVLn6e6MfjxGFbvkAmFMuVDp5OCmjLX1AfaVZba09/SOnV8x8tM1lVbWzcMF1JhFmTXkRVXD8 YuKjMdmLanXfJ65SHOe4dpiefFoOilpOYhub8jUNSYmoDW5VVcarstXwYXv8RLS7w+z4jKa8J hvxTkg5g8eXnQkTsRLW/bUtrie+C63zbUvc9vvLt29d2grA4DmW5SO7fTUFNgoPZrbgtHu7zv nGmPOpRL9cHuMQ= Subject: [libcamera-devel] [PATCH 2/5] 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 | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) -- 2.25.1 diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 3f99b5e2..694d761a 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -10,6 +10,7 @@ import argparse import string import sys import yaml +from math import prod def snake_case(s): @@ -22,6 +23,26 @@ def format_description(description): return '\n'.join([(line and ' * ' or ' *') + line for line in description]) +def get_ctrl_type_format(ctrl): + ctrl_type = ctrl['type'] + ctrl_size_arr = ctrl.get('size') + ctrl_is_span = ctrl_size_arr is not None + if ctrl_is_span: + ctrl_span_size = prod(ctrl_size_arr) if len(ctrl_size_arr)>0 else None + + if ctrl_type == 'string': + ctrl_type = 'std::string' + elif ctrl_is_span: + if ctrl_span_size: + # fixed-sized Span + ctrl_type = 'Span'.format(ctrl_type, ctrl_span_size) + else: + # variable-sized Span + ctrl_type = 'Span'.format(ctrl_type) + + return ctrl_type + + def generate_cpp(controls): enum_doc_start_template = string.Template('''/** * \\enum ${name}Enum @@ -50,11 +71,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_format(ctrl) info = { 'name': name, @@ -135,11 +152,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_format(ctrl) info = { 'name': name,