From patchwork Wed Jun 1 23:18:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16129 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 79CE1C326E for ; Wed, 1 Jun 2022 23:18:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C370E65641; Thu, 2 Jun 2022 01:18:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654125499; 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=w/Bwbl2oBcYQMJZbOJudJKCs2wyGQAoZSaxa46aZxIaD3UUbPE032fmN2k71G2eQm SSNzRt46wdG/unfcbbnSWKPc8uh2bxd+qPoVhyQMnyBUb+rZlEG1I77ujHXFJn+Uph aje0oomV09w/aWFd4LRjcWOQpkbwW0xbSnV9I4HUOTS8mdqorgYmqD0sPT/riqoRsb /RXoDPi6YU56yhg3Y1Ol1Wm/YjMCz1InhCdaKhak8BngxEPMSvbotuNBEWWlFALoH+ q0132JAXJ+ssN92gLRMLeWCQWIuHRal5HfR+uZ7nUb/GM+2YVuNVS5RRaed/g+SCGj kcRMhr9v0cV5w== Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FAA165632 for ; Thu, 2 Jun 2022 01:18:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="ED6AoOGm"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1654125496; bh=ATeKyqRnHw9iVa0bTgA+UNdA5iARog/YOYpAYY2+Gv0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ED6AoOGmKmjE/qfhSJwV2ACzqDIZ3eDxTap0UnEUtKr6nNLp9+8IY3ovKqf5t29+7 oPod3HNTMui8dHbO18hUr8J0Vz0R3G43Kdeonjk7D2RZjf2aN7nhFC80qORwoghZs2 2Yg9BR4N/yLR5w9EHFxHwCvgASlggFNvYSZIx9lY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MfYPY-1nKzrL3JtI-00fzHs; Thu, 02 Jun 2022 01:18:15 +0200 To: libcamera-devel@lists.libcamera.org Date: Thu, 2 Jun 2022 00:18:01 +0100 Message-Id: <20220601231802.16735-4-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220601231802.16735-1-Rauch.Christian@gmx.de> References: <20220601231802.16735-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:khRDyhaHiqHSr2y8aNEkv0c27ogfUhr32bCokD3fpXQbhYx8ORC ImGdYdaDRuhSGyKvcZLhXLbKGs0XhkXvcAFpGKW5UL1MAl2B1CLeUvX/aHsUhM8YAzTn23O jfvC8awfxYqpXH1oSDMDdw8fvBg8qZQy/AIrXRBUMS73uXF5pn/HYhSlsRCHF7HsGuGqEbU df/ZwUDVbVJRhy+YJUk1w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:/g4I5oSw5/s=:AdIhL/1EBP39/x1yd27y8N 0U6G8Xbqqj9Kp1GfRWm2ekMvXqYaNzJF9NE1KAhRcmjA0dJMMYylfhtdTTATlXo5Be1QDCPDz o7f661cjIrBmOKDFnt052WC1EhZa61DfBExCV92EaxdFC+DJrMN5gwQ+2Hd4+NW5aX9lFYQqD 5ExqCKboDW4BwOUXzC9iRJdbf/7bWFaRdU65Y2kSqIfw2VwIZnqlLcjAcarhShoWzVtofervY 59wJWL/1pt7NkDdbo/FAbsQJP4kvy6l/Lcm+S7wKYrF4rnuksJJeakS3XNHzrt1UcNSyKJnBS 1bicsKR8sbM+WlL7n8RZ837nLFinH0o571Poej4R0j8Y88TPC4AnNgdBn3VDGPFHISqDDlW7U bBxrsDRrOuz1bjf5Id6L2Zf6aOK3jmIgh6pl3bZBpzwR4GjQE8o0oBYz4P7rrNclyLTf7fliL oQhY5YNlSdm5W2HnzHfo2iNnKm67fdh6c9aCmXsQfjO/lZxwYn7HY2Aa1a2qTVUFNUU7gByK4 YadbblYWbE0rBBQWZy5Ez3XQ87evB1n3zhzm7l7K+baR8P2QHo4rd0G/BfOGFfzfOM2BodDlT Jbn3tQsFEz0vv3DtgHbUSbStuHsjRZuoquCwKWqXdtA/i7tHBpobZGbWkuH7ajdkeZ22ymZ09 UwJz/qdvSSOv8XuvTNvKpzkeIGKiY8cMcK2zR4yH8stqlJ/EPMtRuJAyDxmKtCjbcsp2C6pNC cs3/5UbZtH/ekf7jhy9OGWWG+QchuRa+yz2p2cNVfUgB1TSqA4e7lIJ/VLzKWqF4K2XTgL/ah cZ0VtAgFPCDz3cuN8KnzvzWy+a5pIP5xdqjyp675jadrKRe3ho3nwU6nT5qL8SFAlm/o4V8jN 9kqIMl421jOXVkqcMXbsLNOgrN3GIoJ51sFzYeUvFFoQ80vrQsbkraBk4Dy2KqIcEqWnX+F6O tcARSj1CnVe8XerGtU2FOlAeXIU3dTzP9ogEwhQk/bOHIdxxs+Yd+QVrLE4O/fPxlXK0BHvh9 +2CUFNzIvQRnLwjYkORei0oZ6ALbQHqRhxmIUSzB+iKMpD4f3u4V1DD3iPj+KIHKpTaFcdzPA mJzTvjRP0V3sdYLvjxeeSBpZYU3aduGTfZitPTcqUbGif8CeoRn97quvA== Subject: [libcamera-devel] [PATCH v5 3/4] libcamera: controls: 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 Reviewed-by: Jacopo Mondi --- 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,