From patchwork Sat Jun 4 21:11:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16174 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 4B751C3275 for ; Sat, 4 Jun 2022 21:11:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1860F6563E; Sat, 4 Jun 2022 23:11:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654377116; 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=ka/tYQclf2A2jdAKscy0PiwdhkghDk5xrMBu6c0qKIXIkJsB7YNOeYwX11EVcFDJh tR3qaw3HRiS/LgN3ja+259JQhOTzGlmRU9dL6io+h7lSxrTEm7InsPPy7xakrxPkxh sC5W6jFUsFmckWq1HZlVxEIo/9/t98zjo5p2IW1jLbEtuklM9p44ehKKafNVRP4PdN SHZNmCGgm9ExASxTuQcONHhIlHg6Y97dq4EzQAML5hz7zKTzldXU10qCwE5HsOMGR7 2sVPi6CYlyL1ZZwy9k0w2J5lg/aM838XQWFLH+s+4A9jbe1DhFSXvBO0P4Hg8NAph7 YzJzQALagj24A== Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9ABE165635 for ; Sat, 4 Jun 2022 23:11:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="G1vPW9uv"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1654377112; bh=UqwmX7+yMaOqSyR96KduBQpxFaCTOfHvdMO6MxtFX8g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=G1vPW9uvo4WlLg91e50rjghkZCQbhTrnYSUPgBCL+TJF2dfMqWnry0eDyyB02FSDm IjoUsAGzem60fh/fLvALvb2gzGuzhgo20eqO7CcY+GNI/iPi0PDh7naMvm2rfLQrvS YZr+Ro1X5witO9AR0kyPJ5vDnCq+1WG9u75OK5Qs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M3DJv-1nwDcD14fN-003fSg; Sat, 04 Jun 2022 23:11:52 +0200 To: libcamera-devel@lists.libcamera.org Date: Sat, 4 Jun 2022 22:11:47 +0100 Message-Id: <20220604211148.188421-5-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220604211148.188421-1-Rauch.Christian@gmx.de> References: <20220604211148.188421-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:dj24ZkDnChGySjTVCWFewBr46xBhIq3fWed+/gV5Rub+SxYQ5rC w1l0qAFh6z0MGQ2OagmM4T8HkN8sOfVU6dtEu7VksiSaL8qR8AMha7OAXRpq4AMUrt18BSm bNhw29pllit/R2zNfMPQMu8ycHBC2e2YxoPCGRHbXsx9HcM49Naey8+cwMti11/eLKbSuZD 0Wuva4jSGwSPa6ZL30bJQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:VmKbKDsj+zA=:f3f1lyiDzRx70Ve2Ab+ffs ryB69Jb9L37EHUZU+peEHbRKEHzsncgI1I2/K9sDNI6fAttuoKhskFe2DDPVJNPMVT2qCBplV HoK7xKs653xTwWBUxo+UihSGeNalxwnVX/cmynATOVwEHws2lNRGKCiDRaF6+rMH99id0OvOb iVh9qrzmIW68QZMq5UJZ4Kx8Ayh8LgLQYUGMH74niZrZoUwJ3NhFqJdPj8NgvE6vihS/EIql+ 2Z1jizmjAE6QKT/7m1XNrt6Rq9MC1YpyVp4+N9RD15BzWSplI8RfM6PWkHh3jC4v9eBk0BE33 ssDjW+F4Akzl9nT+Q7NQbr6Wq6/E9KED2bb8tIedqhXOtQKlS0PWgAuy9FmcEta0Rug0eM7J7 3S1aLAclavC3Ovb/S7pq2hOxPy0Wj105On6nHDv/DkIbfq2nYKrOfFKZqmJTtXmgWChXORKhE MXlbCLQ60EffWPmuRWAEKW9zJr0AH+T4UyLxR3RF89O34fbc4xAqoXWB0NXTDyF8CjwvvohWW MKzD4VYfhl5WDSA9Re5/y78dSCxGcYhGhOvTTaIPYh8QVj93ZwDWqqTzW9Urkt7As37EUsISk eAeJGv+N+rDgnywv/ktiV5Odcrizv6cDAiKCJC5ZnOSTFap0HCElKzpxvHBMCl4BHWz33nMzp DQLUe0ZJRlEk+qLVvm5K21On5Pa3e3xlXsBx62egOuv0QSj+ljFbPk3q2KcfTtv4r6WH+K8AV PO0T4pPgE2COH0pNxqoIYQ0cNM2Zhwik1uuPsNA9ZAz46bacVlv5cPxWsYyGq7dmMHf/yKEc/ WyZvAPPOyUYtpoC6rJV/LWsAGfXD2Q7EQ+0W4Bn2AE8eWonhgW95SDjs+VFSLYKL011A1iNdN LFBWd9edEZE0gR9rWzmPfUcqhQG+OYZjgo5o/uG9M3qTWyLEW4ehsfzA6ri+IcaRFmQJ/8Z+c 32ojBRBhVpt4mIw+sWRI9xAX9UzcwIQQMKaIbNBhjtDjeQlZC40o9jeTd8iASss8gAgJrdkUv KE7854w0RhJCOX7YyYU1LPcTqj8VoHAawxGh9mAoOJ0SNZyPHVy00D0lIIR1ysfnlQEpQvQ3Z T8DAcVBAtSQHSdciIzvGmAA37wN4Z3oFxc/maNI2nI2gzoEPIJu9HauWQ== Subject: [libcamera-devel] [PATCH v7 4/5] 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,