From patchwork Fri Apr 8 01:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15657 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 24DFEC326E for ; Fri, 8 Apr 2022 01:42:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A87BB65645; Fri, 8 Apr 2022 03:42:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1649382160; bh=+sMZbGtc8XIQIkYA5q0vzqceHFYjae3sgulIDNcz4js=; 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=TUi3b1+54wb59Z0tHXSm85M9oMKIn4bgdE0dnLZPc9JE2Ebq80hoCECgPZK1pVJWt Etmckb4mT3KeQU27Ohg7YwjcQvpiBcUV4NH855wA5/UhcJOB2D3IUwvrypawuSgktO IE3TpYjmsc6hUHOQWKNDfC1BmUaCO1KrxUoSNLhzHJRWxOmvcZq/5fYkfkqxsVP/Aa halPniSAAnm9sEtAXPaJlxQ54R9VRzdCNn92gmY1Rcg97piRd2AQ7TPpmV8LN2tGz3 6PH92vZppcWqlJMkhSXCJbR5LwVBGrHcX3vU+vcyg4rJpDaxTK6nAO3az4DNSCYmB0 OZvlfBeVP7PwQ== Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B159265643 for ; Fri, 8 Apr 2022 03:42:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="GR8z3gdU"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1649382155; bh=+sMZbGtc8XIQIkYA5q0vzqceHFYjae3sgulIDNcz4js=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=GR8z3gdUqVA3Ak9pkMS3HWgLzsHAN8I5+gmprNEP0zfhp838rTVF+db+v3bFWN6Bo jODU4BByTPTB7JgB/nkMW2s60FkrjsDz5Rk/lylS09pw/eRb7LnZI9ZLec9pLl0viQ H3iacYIHqUiYHjwfWAeXIBVDuRGE9oQlWcegs7Ac= 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 1MiacR-1oE9rI13Ad-00ficW; Fri, 08 Apr 2022 03:42:35 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Apr 2022 02:42:29 +0100 Message-Id: <20220408014231.231083-3-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220408014231.231083-1-Rauch.Christian@gmx.de> References: <20220408014231.231083-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:oOViyYxDz7Et/CputRqEQTQRZLfMiceFbpWn4U/c/J7yntjr4Pq 61CPsEmp6zX9Gbb02F/avvDxuu9gyl5KrMK7zmBjo4Yxqy2qZ+RLvU4I9xOEIgXKzabtb1k EsHYFEJciegSgFULvDBhj9YBXpmSx1Lhbc1Mbmeip4dQ4MZwl4nTvSHW2XLNPn9x7b8sEH7 8o7lUDxZt5ArLlhiZzI7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:78ZoOloXiYo=:vMfQDo1I25pb7dxQXC8BdX FTk48tYNUJnxpLrKs8HcJLmjCGxkfKVEifBi3aBaYLqqkLx9O7U+SsB/9juumOnaQwloUQ6St K+SIQrSS8rB7Jw99JnYLemlYv0lmq0q96zV948gA38z0tMj7rYuH1SYrKE0/e2KG27oaqAdQ/ tc7kmn4AVFws3i17Wkj3lET6fi3B9vvGUCAsNzow211MGJ8N5doD03wE4ED7oGFd67EOp5pPD xPEbVHqEAGkJhlH8Z7FCFmQnWoIAA0Fpl0R+fl9k0HyC/W4epMrK0qwQvM2LRQ+V1TzA4vSKm VqipfrVBOFc8zHIFDwj8xUft5lgkUj4t8WJK9CfyonAw07kKYQgDeGBzTzZR3Gi2ihQndL16F zSZRqH2DTA2o/Df2GwWv/WbjvvLZ0OgKbrxRbVwwn9Qicu0uACe0+o4Z7Aiw26mt70U3jVH2W 4i6KKhBEy9q1ywS5I3sjP9JqWCd95NQ9x2p+eExa4Wy1q+/Do/iJEM1lqwIwXyjz35sqoC9Ti VgPchO00Avr/CnW36nl3dedJb/LQv0+li+l/mCRV3saz8K9TKDMVr6hOYu9aaU3Ib1Mcqitqm yHXMqdVkIhMHmgQYuQf2vNd6KGFPXEyiDsEYYfDZtaNHrT1wcMDR+u5i719JVrOpr3gQuMxCv e0NG58+lDc4/zrzfSARo2fDlG3Vusb9buZDFeHlZYZx/iSduOHRN/QZQ/bOPG5s7vTgpdiPeU dQc0JeGTn3PqvCCYsKNyOPwqlpjbOSwFakwFeu+29KH6tHrnxR4KlLkXeBkTKTQ6x8TJpV42A nPrZ/Vf9QVEwUNpVPD5cNJUdrtQOpFdsTLWmSEib0KxS612xSjBpmxxpbL6fxPkUpQWL8rxZQ SvzYoCQZ0D5ONYjBilzey4wH8oSUuBwHBIm8iBGhdWvlj/FHyfXiQxQ7htsEWaM+sK0+NOQls DOTD2P6VAq3Eezv1SQV/iSj6ojFMtqdM5cW43GcK8SkJLPQh9WKgXqzfa3OjcSedwtdrIQWRR k3Qe7IgqFku3yXdCDnqTfU5dlQHK2rrjixnMmqKAmozICJVfjB3p9dc7mjvRPrCAL+Q+BETgc IW7cNmkTRxcNuY= Subject: [libcamera-devel] [PATCH v3 2/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.25.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,