All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] media: v4l2-ctrl: Add p_def to v4l2_ctrl_config
@ 2019-10-14 14:14 Ricardo Ribalda Delgado
  2019-10-16 12:17 ` Hans Verkuil
  0 siblings, 1 reply; 10+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-10-14 14:14 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Hans Verkuil, linux-media, linux-kernel
  Cc: Ricardo Ribalda Delgado

This allows setting the default value on compound controls created via
v4l2_ctrl_new_custom.

Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
---
 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
 include/media/v4l2-ctrls.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index bf50d37ef6c1..12cf38f73f7b 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -2583,7 +2583,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl,
 			type, min, max,
 			is_menu ? cfg->menu_skip_mask : step, def,
 			cfg->dims, cfg->elem_size,
-			flags, qmenu, qmenu_int, ptr_null, priv);
+			flags, qmenu, qmenu_int, cfg->p_def, priv);
 	if (ctrl)
 		ctrl->is_private = cfg->is_private;
 	return ctrl;
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 26205ba3a0a0..2fca5b823961 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -375,6 +375,7 @@ struct v4l2_ctrl_handler {
  * @max:	The control's maximum value.
  * @step:	The control's step value for non-menu controls.
  * @def:	The control's default value.
+ * @p_def:	The control's default value for compound controls.
  * @dims:	The size of each dimension.
  * @elem_size:	The size in bytes of the control.
  * @flags:	The control's flags.
@@ -403,6 +404,7 @@ struct v4l2_ctrl_config {
 	s64 max;
 	u64 step;
 	s64 def;
+	union v4l2_ctrl_ptr p_def;
 	u32 dims[V4L2_CTRL_MAX_DIMS];
 	u32 elem_size;
 	u32 flags;
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-10-16 13:26 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-14 14:14 [PATCH] media: v4l2-ctrl: Add p_def to v4l2_ctrl_config Ricardo Ribalda Delgado
2019-10-16 12:17 ` Hans Verkuil
2019-10-16 12:20   ` Ricardo Ribalda Delgado
2019-10-16 12:32     ` Hans Verkuil
2019-10-16 12:39       ` Ricardo Ribalda Delgado
2019-10-16 12:43         ` Hans Verkuil
2019-10-16 12:57           ` Hans Verkuil
2019-10-16 13:14             ` Ricardo Ribalda Delgado
2019-10-16 13:12           ` Ricardo Ribalda Delgado
2019-10-16 13:26             ` Hans Verkuil

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.