From patchwork Fri Nov 24 12:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 19237 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 F0F9AC328F for ; Fri, 24 Nov 2023 12:37:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8FAAB629CB; Fri, 24 Nov 2023 13:37:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1700829444; bh=e+1S4cqQKkHtFDecfrZTtIrLbNKlOg57Jl+Kb5mGX84=; 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=OPG3ODJrZY32vaK960nuiUz/qG0c44ZdsejT3Vv/A8T9TFy5CQTYaPhxyPPiIStmB 91TDsYZ2SAIokBKapOBD20ObOYAglBiBci22lOA3b9Vdf2E5A+wd1Vbea0PrctyJVD YymDFy5ZsJqJT6ivbkVSqX/ienzq6uZUGv8tUs03SDf14CV4FLDSjWIbFG5NwE/dTz PHSJZmUygVLXXeX6jM5KssoA7r1GBTx7bCmlOYFAXjtRkUguO6Kpvo7FwePiC3VbjP n6sAmAdJZTKqUAfoQupqNPoCk0Jy8pVllxV1o8D7rmzj/v+jdndY2YY/kRekz/tlUN cwG4ERzaRO+QQ== Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DE58629C8 for ; Fri, 24 Nov 2023 13:37:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Tc94LqiC"; dkim-atps=neutral Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c876e44157so22649141fa.2 for ; Fri, 24 Nov 2023 04:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1700829440; x=1701434240; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7xQ3mT2fqmA7FxGo2hVa8X1pmLX80pzAqTF9y+yBgRw=; b=Tc94LqiC/rFD8BW3QuNTbJuP9aRAS47fVkC5GoaYuwHzpI1bYBFZ7N20SVUERPuerk vN6Kf2SXztJm9Hx6kbkUb4+TZtfmBnT0fXi/SGxcMT52IiMTKfD1yxIlsi7Dmbnn4ca3 nq59ga35YsQ/J74Dj+TS/9MvCxhyLjtkpmHdfylV483Tqza10nd42K0+cnfJMa69Z7H7 Vbf6rVxD82Df+Bc6M7XfNnpDkjW8uPgS+ikohmAX6CTVrPJU7xmKlJBh3wBpwddke1d/ ZcbXZ8w9uzEDGOUPkcWuxyPTraGlmLiwQ9ewwYaEN+v+qaTyvo4W0h/JI9iAWdoBXH7R PS+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700829440; x=1701434240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7xQ3mT2fqmA7FxGo2hVa8X1pmLX80pzAqTF9y+yBgRw=; b=AcFNSfc1MFnU0zh+DCyZvCZc4KAq76M+7Yp3PqF7P1+7GBAvkHWj+g+JU0wbnPDp1P qAU/Izm27YSss/aKeHJa5JYZ0vy15IDrC6JtR6CoI7ZMQfPECI6VHwLPI5M79dmHXPZn edqxtFf6pixCNLh6wDfcuCCELOJKJd2d1gjgQOBxZY8N9hMf0KobX9wDDet9nplQXV/r CB5rkDUfuVwszU9enmO2q3C+ABPocCaJdCm0ugXEdSMAdV5rd/i88WA4wNgRmXaHH4tO QZbLlBFfO23PzEhVFAarGEgs39fa6Dc/MpejpuxZ6mwFjIqzmaeZfsfrKCKVC+GocdTh nCTA== X-Gm-Message-State: AOJu0Yy+nbgsp4vJF7LVpWDv16eiO+qy/QODOJpaaq+Jp6izIpwgwnAm gzVxTITUwtCt+ON1MYtqHeqWUOLeAc0iemTIyK2pxQ== X-Google-Smtp-Source: AGHT+IGoJMmTDjSfyZaQtOdqRxQKD10X9HFYeba4TAS1fFG+Z4HNQNApwfu6iu06s4XgMSBckrh/xg== X-Received: by 2002:a2e:9410:0:b0:2c8:74f6:8446 with SMTP id i16-20020a2e9410000000b002c874f68446mr2114231ljh.12.1700829440289; Fri, 24 Nov 2023 04:37:20 -0800 (PST) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id v11-20020a05600c444b00b0040b3867a297sm3303690wmn.36.2023.11.24.04.37.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 04:37:19 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Nov 2023 12:37:10 +0000 Message-Id: <20231124123713.22519-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124123713.22519-1-naush@raspberrypi.com> References: <20231124123713.22519-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/7] libcamera: control: Add vendor control id range reservation 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: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a new control_ranges.yaml file that is used to reserve control id ranges/offsets for libcamera and vendor specific controls. This file is used by the gen-controls.py script to generate control id values for each control. Draft controls now have a separate range from core libcamera controls, breaking the existing numbering behaviour. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- include/libcamera/meson.build | 3 ++- src/libcamera/control_ranges.yaml | 18 ++++++++++++++++++ src/libcamera/meson.build | 4 +++- utils/gen-controls.py | 14 ++++++++++---- 4 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 src/libcamera/control_ranges.yaml diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index a763c8ff4344..79187d3fdfc9 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -76,12 +76,13 @@ foreach mode, entry : controls_map endif template_file = files(outfile + '.in') + ranges_file = files('../../src/libcamera/control_ranges.yaml') control_headers += custom_target(header + '_h', input : input_files, output : outfile, command : [gen_controls, '-o', '@OUTPUT@', '--mode', mode, '-t', template_file, - '@INPUT@'], + '-r', ranges_file, '@INPUT@'], install : true, install_dir : libcamera_headers_install_dir) endforeach diff --git a/src/libcamera/control_ranges.yaml b/src/libcamera/control_ranges.yaml new file mode 100644 index 000000000000..d42447d04647 --- /dev/null +++ b/src/libcamera/control_ranges.yaml @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Copyright (C) 2023, Raspberry Pi Ltd +# +%YAML 1.1 +--- +# Specifies the control id ranges/offsets for core/draft libcamera and vendor +# controls and properties. +ranges: + # Core libcamera controls + libcamera: 0 + # Draft designated libcamera controls + draft: 10000 + # Raspberry Pi vendor controls + rpi: 20000 + # Next range starts at 30000 + +... diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 6d9902e6ffd1..45f63e932e4f 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -141,11 +141,13 @@ foreach mode, input_files : controls_mode_files template_file = files('property_ids.cpp.in') endif + ranges_file = files('control_ranges.yaml') control_sources += custom_target(mode + '_cpp', input : input_files, output : mode + '_ids.cpp', command : [gen_controls, '-o', '@OUTPUT@', - '--mode', mode, '-t', template_file, '@INPUT@']) + '--mode', mode, '-t', template_file, + '-r', ranges_file, '@INPUT@']) endforeach libcamera_sources += control_sources diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 30c58f35473c..04c63098b19b 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -236,7 +236,7 @@ ${vendor_controls_str} } -def generate_h(controls, mode): +def generate_h(controls, mode, ranges): enum_template_start = string.Template('''enum ${name}Enum {''') enum_value_template = string.Template('''\t${name} = ${value},''') enum_values_template = string.Template('''extern const std::array ${name}Values;''') @@ -251,8 +251,10 @@ def generate_h(controls, mode): vendor = 'draft' if ctrl.is_draft else ctrl.vendor if vendor not in ctrls: + if vendor not in ranges.keys(): + raise RuntimeError(f'Control id range is not defined for vendor {vendor}') + id_value[vendor] = ranges[vendor] + 1 ids[vendor] = [] - id_value[vendor] = 1 ctrls[vendor] = [] # Core and draft controls use the same ID value @@ -338,13 +340,17 @@ def main(argv): help='Mode of operation') parser.add_argument('--output', '-o', metavar='file', type=str, help='Output file name. Defaults to standard output if not specified.') + parser.add_argument('--ranges', '-r', type=str, required=True, + help='Control id range reservation file.') parser.add_argument('--template', '-t', dest='template', type=str, required=True, help='Template file name.') parser.add_argument('input', type=str, nargs='+', help='Input file name.') - args = parser.parse_args(argv[1:]) + data = open(args.ranges, 'rb').read() + ranges = yaml.safe_load(data)['ranges'] + controls = [] for input in args.input: data = open(input, 'rb').read() @@ -355,7 +361,7 @@ def main(argv): if args.template.endswith('.cpp.in'): data = generate_cpp(controls) elif args.template.endswith('.h.in'): - data = generate_h(controls, args.mode) + data = generate_h(controls, args.mode, ranges) else: raise RuntimeError('Unknown template type')