From patchwork Mon Jun 27 16:27:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 16382 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 DAF0DBD808 for ; Mon, 27 Jun 2022 16:27:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A4D796563F; Mon, 27 Jun 2022 18:27:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1656347263; bh=BQg10bEAKgUSKfipvpBAEs5RYtA/MK+zNLgmgMgBYV0=; 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=kjZbMM83lNmyHIrdzxLAw0S9+LkbrSwggOBnqA+ZgHQKYyTZRLJpv3V8/TTL3sDUX +0uppi5c4087DOHYVnP8GL1NXtRzYTROTUCWsK5UBdcOw0nz6mIkX1txmtYdIAomgN xvSrLLITJtN6e1zZdYkLPR9d36mRAoNg/AudZNi564MJEPx3ps9AxL26WrTgwVBV8W mhHunbzINIzzvXpVnK4HhbVoQJBuIk6S2pIGHhtuOZWfXZmt2JVxGpYFzzQ35rgetz iqv1vfcAWWKuchr54seti5ny2GLrMLLxOMpPJyQvE46jAw3GU10JBzVKh/XDaPFyBK DOM0URqzLqpEA== Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C1EAC65636 for ; Mon, 27 Jun 2022 18:27:40 +0200 (CEST) Received: (Authenticated sender: jacopo@jmondi.org) by mail.gandi.net (Postfix) with ESMTPSA id 8A1222000C; Mon, 27 Jun 2022 16:27:39 +0000 (UTC) To: libcamera-devel@lists.libcamera.org Date: Mon, 27 Jun 2022 18:27:18 +0200 Message-Id: <20220627162732.33160-2-jacopo@jmondi.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627162732.33160-1-jacopo@jmondi.org> References: <20220627162732.33160-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 01/15] libcamera: control_ids: Add 'internal' argument 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: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add to the gen-controls.py script an optional argument '--internal' that allows to specify if the generated file targets public or internal controls. Add two new tags to the .cpp.in and .h.in templates to specify the correct inclusion path and the correct namespace. Internal controls will be introduced in the next patch. Signed-off-by: Jacopo Mondi --- include/libcamera/control_ids.h.in | 6 +++--- src/libcamera/control_ids.cpp.in | 12 ++++++------ utils/gen-controls.py | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in index 0718a8886f6c..410cfb643a0b 100644 --- a/include/libcamera/control_ids.h.in +++ b/include/libcamera/control_ids.h.in @@ -2,7 +2,7 @@ /* * Copyright (C) 2019, Google Inc. * - * control_ids.h - Control ID list + * ${include_prefix}control_ids.h - Control ID list * * This file is auto-generated. Do not edit. */ @@ -16,7 +16,7 @@ namespace libcamera { -namespace controls { +namespace controls${namespace_extension} { enum { ${ids} @@ -32,6 +32,6 @@ ${draft_controls} } /* namespace draft */ -} /* namespace controls */ +} /* namespace controls${namespace_extension} */ } /* namespace libcamera */ diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in index 5fb1c2c30558..e7e1080e9324 100644 --- a/src/libcamera/control_ids.cpp.in +++ b/src/libcamera/control_ids.cpp.in @@ -2,17 +2,17 @@ /* * Copyright (C) 2019, Google Inc. * - * control_ids.cpp : Control ID list + * ${include_prefix}control_ids.cpp : Control ID list * * This file is auto-generated. Do not edit. */ -#include +#include #include /** - * \file control_ids.h - * \brief Camera control identifiers + * \file libcamera/${include_prefix}control_ids.h + * \brief Control identifiers */ namespace libcamera { @@ -20,7 +20,7 @@ namespace libcamera { /** * \brief Namespace for libcamera controls */ -namespace controls { +namespace controls${namespace_extension} { ${controls_doc} @@ -57,6 +57,6 @@ extern const ControlIdMap controls { ${controls_map} }; -} /* namespace controls */ +} /* namespace controls${namespace_extension} */ } /* namespace libcamera */ diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 3f99b5e2ba7d..978179f63858 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -188,6 +188,17 @@ def fill_template(template, data): return template.substitute(data) +def handle_internal_arg(internal, data): + + if internal: + data["namespace_extension"] = "::internal" + data["include_prefix"] = "internal/" + return + + data["namespace_extension"] = "" + data["include_prefix"] = "" + + def main(argv): # Parse command line arguments @@ -198,6 +209,7 @@ def main(argv): help='Input file name.') parser.add_argument('template', type=str, help='Template file name.') + parser.add_argument('--internal', type=bool, default=False) args = parser.parse_args(argv[1:]) data = open(args.input, 'rb').read() @@ -210,6 +222,8 @@ def main(argv): else: raise RuntimeError('Unknown template type') + handle_internal_arg(args.internal, data) + data = fill_template(args.template, data) if args.output: