{"id":21149,"url":"https://patchwork.libcamera.org/api/patches/21149/?format=json","web_url":"https://patchwork.libcamera.org/patch/21149/","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":"<20240902221317.19005-1-laurent.pinchart@ideasonboard.com>","date":"2024-09-02T22:13:16","name":"[1/2] utils: ipc: Include in generated headers where needed","commit_ref":"0e333755ff3a27cfab4dcd5132b0c6dfe7a209aa","pull_url":null,"state":"accepted","archived":false,"hash":"6c38df75a16904d9bd1ee8be3e1aff78e4567d35","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21149/mbox/","series":[{"id":4557,"url":"https://patchwork.libcamera.org/api/series/4557/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4557","date":"2024-09-02T22:13:16","name":"[1/2] utils: ipc: Include in generated headers where needed","version":1,"mbox":"https://patchwork.libcamera.org/series/4557/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21149/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21149/checks/","tags":{},"headers":{"Return-Path":"","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 9116CC324C\n\tfor ;\n\tMon, 2 Sep 2024 22:13:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C44B3634E0;\n\tTue, 3 Sep 2024 00:13:52 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4895D618FF\n\tfor ;\n\tTue, 3 Sep 2024 00:13:50 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9EF1C21E;\n\tTue, 3 Sep 2024 00:12:38 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"tJKGOT0h\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725315158;\n\tbh=8zkx8BzCml3W0WN12swY2XYCZqb0+JJQve+/k7bSdtQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=tJKGOT0hDPo394NFzH+hTl5qj8pDCeFcGQKJF7XhrB3TMR5YpjiUbCdd7lnw/cbx+\n\tiBdoXpQ6qm4FetPylsMQ52NzFP2gX5CxIashXDFOfF+7wEHgWAi0eRC2qJdRw4xjfa\n\tgdx+isWd9EMxZ1kRZn+rUv0nELKsrx8rSGLHM688=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ,\n\tMilan Zamazal ","Subject":"[PATCH 1/2] utils: ipc: Include in generated headers where\n\tneeded","Date":"Tue, 3 Sep 2024 01:13:16 +0300","Message-ID":"<20240902221317.19005-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Depending on the types used in the IPA interface, generated headers may\nuse the std::string class. Include when needed.\n\nSigned-off-by: Laurent Pinchart \n---\n .../libcamera_templates/core_ipa_interface.h.tmpl | 1 +\n .../libcamera_templates/module_ipa_interface.h.tmpl | 7 ++++---\n utils/codegen/ipc/generators/mojom_libcamera_generator.py | 2 ++\n 3 files changed, 7 insertions(+), 3 deletions(-)\n\n\nbase-commit: ac1c57fcf5dff06ae4e7e5fad7baa8f93c413e37","diff":"diff --git a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\nindex 7f2d0810823b..590135b88421 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\n@@ -15,6 +15,7 @@\n #pragma once\n \n {% if has_map %}#include {% endif %}\n+{% if has_string %}#include {% endif %}\n {% if has_array %}#include {% endif %}\n \n #include \ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\nindex 4d88a3d77d0f..0111d0c4c591 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\n@@ -14,12 +14,13 @@\n \n #pragma once\n \n+{% if has_map %}#include {% endif %}\n+{% if has_string %}#include {% endif %}\n+{% if has_array %}#include {% endif %}\n+\n #include \n #include \n \n-{% if has_map %}#include {% endif %}\n-{% if has_array %}#include {% endif %}\n-\n namespace libcamera {\n {%- if has_namespace %}\n {% for ns in namespace %}\ndiff --git a/utils/codegen/ipc/generators/mojom_libcamera_generator.py b/utils/codegen/ipc/generators/mojom_libcamera_generator.py\nindex b8209e516297..d9c620a05e2a 100644\n--- a/utils/codegen/ipc/generators/mojom_libcamera_generator.py\n+++ b/utils/codegen/ipc/generators/mojom_libcamera_generator.py\n@@ -467,6 +467,7 @@ class Generator(generator.Generator):\n 'enums': self.module.enums,\n 'has_array': len([x for x in self.module.kinds.keys() if x[0] == 'a']) > 0,\n 'has_map': len([x for x in self.module.kinds.keys() if x[0] == 'm']) > 0,\n+ 'has_string': len([x for x in self.module.kinds.keys() if x[0] == 's']) > 0,\n 'has_namespace': self.module.mojom_namespace != '',\n 'interface_event': GetEventInterface(self.module.interfaces),\n 'interface_main': GetMainInterface(self.module.interfaces),\n@@ -486,6 +487,7 @@ class Generator(generator.Generator):\n 'enums_gen_header': [x for x in self.module.enums if x.attributes is None or 'skipHeader' not in x.attributes],\n 'has_array': len([x for x in self.module.kinds.keys() if x[0] == 'a']) > 0,\n 'has_map': len([x for x in self.module.kinds.keys() if x[0] == 'm']) > 0,\n+ 'has_string': len([x for x in self.module.kinds.keys() if x[0] == 's']) > 0,\n 'structs_gen_header': [x for x in self.module.structs if x.attributes is None or 'skipHeader' not in x.attributes],\n 'structs_gen_serializer': [x for x in self.module.structs if x.attributes is None or 'skipSerdes' not in x.attributes],\n }\n","prefixes":["1/2"]}