{"id":15657,"url":"https://patchwork.libcamera.org/api/patches/15657/?format=json","web_url":"https://patchwork.libcamera.org/patch/15657/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220408014231.231083-3-Rauch.Christian@gmx.de>","date":"2022-04-08T01:42:29","name":"[libcamera-devel,v3,2/4] generate fixed- and variable-sized Span Controls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e9cbc895d2a50e978afebbdb8545736153ffb9af","submitter":{"id":111,"url":"https://patchwork.libcamera.org/api/people/111/?format=json","name":"Christian Rauch","email":"Rauch.Christian@gmx.de"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15657/mbox/","series":[{"id":3045,"url":"https://patchwork.libcamera.org/api/series/3045/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3045","date":"2022-04-08T01:42:28","name":"generate and use fixed-sized Span Control types","version":3,"mbox":"https://patchwork.libcamera.org/series/3045/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15657/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15657/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 24DFEC326E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  8 Apr 2022 01:42:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A87BB65645;\n\tFri,  8 Apr 2022 03:42:40 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.17.20])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B159265643\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  8 Apr 2022 03:42:35 +0200 (CEST)","from localhost.localdomain ([92.10.251.63]) by mail.gmx.net\n\t(mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id\n\t1MiacR-1oE9rI13Ad-00ficW; Fri, 08 Apr 2022 03:42:35 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1649382160;\n\tbh=+sMZbGtc8XIQIkYA5q0vzqceHFYjae3sgulIDNcz4js=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=TUi3b1+54wb59Z0tHXSm85M9oMKIn4bgdE0dnLZPc9JE2Ebq80hoCECgPZK1pVJWt\n\tEtmckb4mT3KeQU27Ohg7YwjcQvpiBcUV4NH855wA5/UhcJOB2D3IUwvrypawuSgktO\n\tIE3TpYjmsc6hUHOQWKNDfC1BmUaCO1KrxUoSNLhzHJRWxOmvcZq/5fYkfkqxsVP/Aa\n\thalPniSAAnm9sEtAXPaJlxQ54R9VRzdCNn92gmY1Rcg97piRd2AQ7TPpmV8LN2tGz3\n\t6PH92vZppcWqlJMkhSXCJbR5LwVBGrHcX3vU+vcyg4rJpDaxTK6nAO3az4DNSCYmB0\n\tOZvlfBeVP7PwQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1649382155;\n\tbh=+sMZbGtc8XIQIkYA5q0vzqceHFYjae3sgulIDNcz4js=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=GR8z3gdUqVA3Ak9pkMS3HWgLzsHAN8I5+gmprNEP0zfhp838rTVF+db+v3bFWN6Bo\n\tjODU4BByTPTB7JgB/nkMW2s60FkrjsDz5Rk/lylS09pw/eRb7LnZI9ZLec9pLl0viQ\n\tH3iacYIHqUiYHjwfWAeXIBVDuRGE9oQlWcegs7Ac="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"GR8z3gdU\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","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","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:oOViyYxDz7Et/CputRqEQTQRZLfMiceFbpWn4U/c/J7yntjr4Pq\n\t61CPsEmp6zX9Gbb02F/avvDxuu9gyl5KrMK7zmBjo4Yxqy2qZ+RLvU4I9xOEIgXKzabtb1k\n\tEsHYFEJciegSgFULvDBhj9YBXpmSx1Lhbc1Mbmeip4dQ4MZwl4nTvSHW2XLNPn9x7b8sEH7\n\t8o7lUDxZt5ArLlhiZzI7g==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:78ZoOloXiYo=:vMfQDo1I25pb7dxQXC8BdX\n\tFTk48tYNUJnxpLrKs8HcJLmjCGxkfKVEifBi3aBaYLqqkLx9O7U+SsB/9juumOnaQwloUQ6St\n\tK+SIQrSS8rB7Jw99JnYLemlYv0lmq0q96zV948gA38z0tMj7rYuH1SYrKE0/e2KG27oaqAdQ/\n\ttc7kmn4AVFws3i17Wkj3lET6fi3B9vvGUCAsNzow211MGJ8N5doD03wE4ED7oGFd67EOp5pPD\n\txPEbVHqEAGkJhlH8Z7FCFmQnWoIAA0Fpl0R+fl9k0HyC/W4epMrK0qwQvM2LRQ+V1TzA4vSKm\n\tVqipfrVBOFc8zHIFDwj8xUft5lgkUj4t8WJK9CfyonAw07kKYQgDeGBzTzZR3Gi2ihQndL16F\n\tzSZRqH2DTA2o/Df2GwWv/WbjvvLZ0OgKbrxRbVwwn9Qicu0uACe0+o4Z7Aiw26mt70U3jVH2W\n\t4i6KKhBEy9q1ywS5I3sjP9JqWCd95NQ9x2p+eExa4Wy1q+/Do/iJEM1lqwIwXyjz35sqoC9Ti\n\tVgPchO00Avr/CnW36nl3dedJb/LQv0+li+l/mCRV3saz8K9TKDMVr6hOYu9aaU3Ib1Mcqitqm\n\tyHXMqdVkIhMHmgQYuQf2vNd6KGFPXEyiDsEYYfDZtaNHrT1wcMDR+u5i719JVrOpr3gQuMxCv\n\te0NG58+lDc4/zrzfSARo2fDlG3Vusb9buZDFeHlZYZx/iSduOHRN/QZQ/bOPG5s7vTgpdiPeU\n\tdQc0JeGTn3PqvCCYsKNyOPwqlpjbOSwFakwFeu+29KH6tHrnxR4KlLkXeBkTKTQ6x8TJpV42A\n\tnPrZ/Vf9QVEwUNpVPD5cNJUdrtQOpFdsTLWmSEib0KxS612xSjBpmxxpbL6fxPkUpQWL8rxZQ\n\tSvzYoCQZ0D5ONYjBilzey4wH8oSUuBwHBIm8iBGhdWvlj/FHyfXiQxQ7htsEWaM+sK0+NOQls\n\tDOTD2P6VAq3Eezv1SQV/iSj6ojFMtqdM5cW43GcK8SkJLPQh9WKgXqzfa3OjcSedwtdrIQWRR\n\tk3Qe7IgqFku3yXdCDnqTfU5dlQHK2rrjixnMmqKAmozICJVfjB3p9dc7mjvRPrCAL+Q+BETgc\n\tIW7cNmkTRxcNuY=","Subject":"[libcamera-devel] [PATCH v3 2/4] generate fixed- and variable-sized\n\tSpan Controls","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Christian Rauch via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Christian Rauch <Rauch.Christian@gmx.de>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"This defines Controls with a 'size' as either variable-sized Span<T> or as\nfixed-sized Span<T,N>.\n\nSigned-off-by: Christian Rauch <Rauch.Christian@gmx.de>\n---\n utils/gen-controls.py | 32 ++++++++++++++++++++++----------\n 1 file changed, 22 insertions(+), 10 deletions(-)\n\n--\n2.25.1","diff":"diff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex 3f99b5e2..c9e79a22 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -7,6 +7,7 @@\n # gen-controls.py - Generate control definitions from YAML\n\n import argparse\n+import math\n import string\n import sys\n import yaml\n@@ -22,6 +23,25 @@ def format_description(description):\n     return '\\n'.join([(line and ' * ' or ' *') + line for line in description])\n\n\n+def get_ctrl_type(ctrl):\n+    ctrl_type = ctrl['type']\n+    ctrl_size_arr = ctrl.get('size')\n+    ctrl_is_span = ctrl_size_arr is not None\n+\n+    if ctrl_type == 'string':\n+        return 'std::string'\n+    elif ctrl_is_span:\n+        ctrl_span_size = math.prod(ctrl_size_arr) if len(ctrl_size_arr) > 0 else None\n+        if ctrl_span_size:\n+            # fixed-sized Span\n+            return f\"Span<const {ctrl_type}, {ctrl_span_size}>\"\n+        else:\n+            # variable-sized Span\n+            return f\"Span<const {ctrl_type}>\"\n+    else:\n+        return ctrl_type\n+\n+\n def generate_cpp(controls):\n     enum_doc_start_template = string.Template('''/**\n  * \\\\enum ${name}Enum\n@@ -50,11 +70,7 @@ ${description}\n         name, ctrl = ctrl.popitem()\n         id_name = snake_case(name).upper()\n\n-        ctrl_type = ctrl['type']\n-        if ctrl_type == 'string':\n-            ctrl_type = 'std::string'\n-        elif ctrl.get('size'):\n-            ctrl_type = 'Span<const %s>' % ctrl_type\n+        ctrl_type = get_ctrl_type(ctrl)\n\n         info = {\n             'name': name,\n@@ -135,11 +151,7 @@ def generate_h(controls):\n\n         ids.append('\\t' + id_name + ' = ' + str(id_value) + ',')\n\n-        ctrl_type = ctrl['type']\n-        if ctrl_type == 'string':\n-            ctrl_type = 'std::string'\n-        elif ctrl.get('size'):\n-            ctrl_type = 'Span<const %s>' % ctrl_type\n+        ctrl_type = get_ctrl_type(ctrl)\n\n         info = {\n             'name': name,\n","prefixes":["libcamera-devel","v3","2/4"]}