summaryrefslogtreecommitdiff
path: root/utils/ipc/generators
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2021-03-08 16:48:26 +0900
committerPaul Elder <paul.elder@ideasonboard.com>2021-03-09 11:49:02 +0900
commit51e5d67f8e70a316f08c928bc1000a76c163e06c (patch)
tree7bd72ab73aea975e8aa776b4fa21c58f024eff75 /utils/ipc/generators
parent3a59555414da0f1c8a24bdede1ae279154a2f058 (diff)
utils: ipc: Support custom parameters to init()
Add support to the mojom-based code generator for custom parameters to init(). Remove the parameter type and count validation as well. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'utils/ipc/generators')
-rw-r--r--utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl15
-rw-r--r--utils/ipc/generators/libcamera_templates/proxy_functions.tmpl13
-rw-r--r--utils/ipc/generators/mojom_libcamera_generator.py12
3 files changed, 13 insertions, 27 deletions
diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
index d451fab3..3eb3dced 100644
--- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
+++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
@@ -141,10 +141,19 @@ void {{proxy_name}}::recvMessage(const IPCMessage &data)
{{proxy_funcs.func_sig(proxy_name, method, "Thread")}}
{
-{%- if method.mojom_name == "init" %}
- {{proxy_funcs.init_thread_body()}}
-{%- elif method.mojom_name == "stop" %}
+{%- if method.mojom_name == "stop" %}
{{proxy_funcs.stop_thread_body()}}
+{%- elif method.mojom_name == "init" %}
+ {{ method|method_return_value + " _ret = " if method|method_return_value != "void" -}}
+ ipa_->{{method.mojom_name}}(
+ {%- for param in method|method_param_names -%}
+ {{param}}{{- ", " if not loop.last}}
+ {%- endfor -%}
+);
+
+ proxy_.moveToThread(&thread_);
+
+ return {{ "_ret" if method|method_return_value != "void" }};
{%- elif method.mojom_name == "start" %}
running_ = true;
thread_.start();
diff --git a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
index 40611feb..f2d86b67 100644
--- a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
+++ b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
@@ -20,19 +20,6 @@
{%- endmacro -%}
{#
- # \brief Generate function body for IPA init() function for thread
- #}
-{%- macro init_thread_body() -%}
- int ret = ipa_->init(settings);
- if (ret)
- return ret;
-
- proxy_.moveToThread(&thread_);
-
- return 0;
-{%- endmacro -%}
-
-{#
# \brief Generate function body for IPA stop() function for thread
#}
{%- macro stop_thread_body() -%}
diff --git a/utils/ipc/generators/mojom_libcamera_generator.py b/utils/ipc/generators/mojom_libcamera_generator.py
index 438e41c6..fa0c21a2 100644
--- a/utils/ipc/generators/mojom_libcamera_generator.py
+++ b/utils/ipc/generators/mojom_libcamera_generator.py
@@ -341,19 +341,9 @@ def ValidateInterfaces(interfaces):
ValidateSingleLength(f_start, 'start()', False)
ValidateSingleLength(f_stop, 'stop()', False)
- f_init = f_init[0]
- f_start = f_start[0]
f_stop = f_stop[0]
- # Validate parameters to init()
- ValidateSingleLength(f_init.parameters, 'input parameter to init()')
- ValidateSingleLength(f_init.response_parameters, 'output parameter from init()')
- if f_init.parameters[0].kind.mojom_name != 'IPASettings':
- raise Exception('init() must have single IPASettings input parameter')
- if f_init.response_parameters[0].kind.spec != 'i32':
- raise Exception('init() must have single int32 output parameter')
-
- # No need to validate start() as it is customizable
+ # No need to validate init() and start() as they are customizable
# Validate parameters to stop()
ValidateZeroLength(f_stop.parameters, 'input parameter to stop()')