From patchwork Fri Jun 10 12:03:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16192 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 15633BD161 for ; Fri, 10 Jun 2022 12:03:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BF5B16563E; Fri, 10 Jun 2022 14:03:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654862626; bh=UqwmX7+yMaOqSyR96KduBQpxFaCTOfHvdMO6MxtFX8g=; 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=dXeJayueG2dOtv9W0Xq54FHYZm1W1BSnDPLAaHiMffBdNid4p3TU5BXu+oRcMLxkr 5IzeJR6P6bHdkA+5fzcvTJhZdbpYsfBgUX5SOFhGkmGCPlSlnLQp7CXH9Us4lI1aZN OFiBqiNJNZLoDz+sUlfCQp8HFD7I6KvfyvA4uNbBGwsggcqWpVBQkunQfo3oIFMhyI hLGh97U7b+xiX6NOB/LuxcHZZk/cVrL4AtKCcvo8wsm/Q20fxub0ImrxhF6pXT07yC XGN71FumkWE89OHq3mxZa72VhTZuiMF1Vh5XHi/8kYzSuKms0nqJ17pPyVg6B61/Ey 5XThRgmxX2JYg== Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1D54565635 for ; Fri, 10 Jun 2022 14:03:42 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="YeRheBFe"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1654862622; bh=UqwmX7+yMaOqSyR96KduBQpxFaCTOfHvdMO6MxtFX8g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=YeRheBFekjIUDYppK2setFQbTgYj1n4uFZyzPI5yJzvnSB3kF06nyzb/Jv+D4jpwK 5br2J1fOcdlvThohRf8XpogMVxchX74QUBWcAyqQBaXsXgH6aCDwADwY/DIUq1nif1 wT3F9HsM1vze77Livmjgcashl1OoCruHYPOznW5E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M1Ygt-1o10wI3Azr-0031az; Fri, 10 Jun 2022 14:03:41 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Jun 2022 13:03:37 +0100 Message-Id: <20220610120338.96883-4-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220610120338.96883-1-Rauch.Christian@gmx.de> References: <20220610120338.96883-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:BTulCx1S+bFhonHqBTaBanSOVXgY3fdkv7aDzDlABF7hSnZjF2F IlGlrouEh3yCj7oetaqcNal9MCYgxfzGEunTICCLoqBssxaIT4CRXo5pTdpk/uZPe0OPjdP ubTKsfJjwyHv9N1mZfPyhx2A4D2HpTWEUaH1g0z5EYqSIz6hH9+OekcJBAwjXaRIzo+PtR7 2N2of5Zd/I2uVZpk+vCTQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Hjhxtm99Vo8=:qgNSD+dI6AJhhwbyQOHi2t bG6fw4TG7pmCOevStFAcG7oXMDkssr3ED921JY0VgRf+29fXGjQK76JCd+j09dykeCa4C3Sau /2RFgboWRNFBIsLzlaMd+75aiwdIzs4nMCcIoeIsM8uImJuKUn0Iv5S25WplrHdkq7swAS5K3 PWSMOrlr+v5yAqA/rReuhiuQ9J54sgUFiqo+ueekkbLaxsXOpkFjPZdMW5fFEP+dtGZW1HIl/ yODO3xiQOVxgS1pBdikvg/5oS8XDAXXSfyLLeUhhMfmqYqinxna5qS2U3A954gVSK2Zc6Vwxe Fh/1Zgb2TbkwztTwn2RfkvroPwL/qBmq5CkneVgxvftMsHHfUMuR99T1vaVwUDyCuVtqqnOY9 iZHzBNhp5es9tR/XlO2bTWITeGI5m8gALhzCapJT5rsPxfRT46RcYABxNITIG82QE14IqPzyM u55od1l5Bcv1GNI7h0smwzqmdIeekU6kG8IIMTqLs+xweqet1a85JO4amCasQWZ904gcz925R BsCjDl/mHktEbEa0Wz1shhjKvy9Dawa0VtN8R8Q8dIxHFwc3Rst2gpyZmLhdREwp+1wLqqEAv Cm8a2dtBhsxDqWPzk6xAHfA41Jp8C6A1QwIG5tsgjKf1RTTxnxXBW3cRgHfZD/odntmPGXTht Vuy9mdo1ices3n4IFgUvqr+0N77Bw46Jm4qGXHY54UJj6eJQWRUgG1/kCvWmtPwpphYLXPirK rO6MfHyK5bBl1NbxzYNDaWPfjgfBsZlQNKaQIz4nDPvi+sCUdz5P6kG2L7mVBp83lNCtcVhp2 WVKnr4w8kXlHmcb2rrECWnHcxRigu5a6HK0JkKKkF+FMRWjhjD7bfjaZsLrsvViGOGniMGQlv x4jsGsysVHuSq5jLGYGb6ZnLmeWUDVPdDrCCkfqKyUsC2+gxaAihE6zAThWwsmamEgD8/Lxcb i3OunYPrsGXQo9+hWV02QxMXEat/6Y3mvxRHDjxa/mpnFqSxLDUfB34LXCrIPVZEIVCGGfKJx 3Wo+WOz1C8Lh0jIcEXFwcUa+ydQ0Br82Psz8v/MomBT3UA0gCgTqmeGSVnE5/AAeZzH6e4m/y ofKDjeEsrLWIqxcaaEszOu6XvVqQ8uWskNOQeJhPkPq3C7jtX0Cz/4G6Q== Subject: [libcamera-devel] [PATCH v8 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..46ba4394 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -7,6 +7,8 @@ # gen-controls.py - Generate control definitions from YAML import argparse +from functools import reduce +import operator import string import sys import yaml @@ -22,6 +24,24 @@ 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') + + if ctrl_type == 'string': + return 'std::string' + elif ctrl_size_arr is not None: + if len(ctrl_size_arr) > 0: + # fixed-sized Span + ctrl_span_size = reduce(operator.mul, ctrl_size_arr) + 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,