Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / include / media / v4l2-ctrls.h

diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index a9ced6bbee55b18ba28fbd9621c71b5ccbca93bf..05ebb9ef9e738a3ff14c839b24ed0d3cda7c706c 100644 (file)
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -166,8 +166,15 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
  *             empty strings ("") correspond to non-existing menu items (this
  *             is in addition to the menu_skip_mask above). The last entry
  *             must be NULL.
+ *             Used only if the @type is %V4L2_CTRL_TYPE_MENU.
+ * @qmenu_int: A 64-bit integer array for with integer menu items.
+ *             The size of array must be equal to the menu size, e. g.:
+ *             :math:`ceil(\frac{maximum - minimum}{step}) + 1`.
+ *             Used only if the @type is %V4L2_CTRL_TYPE_INTEGER_MENU.
  * @flags:     The control's flags.
- * @cur:       The control's current value.
+ * @cur:       Structure to store the current value.
+ * @cur.val:   The control's current value, if the @type is represented via
+ *             a u32 integer (see &enum v4l2_ctrl_type).
  * @val:       The control's new s32 value.
  * @priv:      The control's private pointer. For use by the driver. It is
  *             untouched by the control framework. Note that this pointer is
@@ -1139,7 +1146,7 @@ int v4l2_s_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
 
 /**
  * v4l2_ctrl_subdev_subscribe_event - Helper function to implement
- *     as a &struct v4l2_subdev_core_ops subscribe_event function
+ *     as a &struct v4l2_subdev_core_ops subscribe_event function
  *     that just subscribes control events.
  *
  * @sd: pointer to &struct v4l2_subdev