[libcamera-devel,v1.1] utils: ipc: Support custom parameters to init()
diff mbox series

Message ID 20210304090622.13623-1-paul.elder@ideasonboard.com
State Superseded
Headers show
Series
  • [libcamera-devel,v1.1] utils: ipc: Support custom parameters to init()
Related show

Commit Message

Paul Elder March 4, 2021, 9:06 a.m. UTC 
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>

---
Changes in v1.1
- remove unused variables in the python file
---
 .../libcamera_templates/module_ipa_proxy.cpp.tmpl | 15 ++++++++++++---
 .../libcamera_templates/proxy_functions.tmpl      | 13 -------------
 utils/ipc/generators/mojom_libcamera_generator.py | 12 +-----------
 3 files changed, 13 insertions(+), 27 deletions(-)

Patch
diff mbox series 

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 5e0d3976..8ba1a5cf 100644
--- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
+++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
@@ -144,10 +144,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
@@ -19,19 +19,6 @@ 
 ){{" override" if override}}
 {%- 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
  #}
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()')