aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-06-07 05:47:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:19 -0400
commitab892bac8438c5c2ff09a60d765d9b0c14941ba9 (patch)
treef0c96b30275086c26b9e17b0092b7587b6f0ac10 /include
parenta1c894fba3c306a738576710ca35e70a32b74a6d (diff)
[media] v4l2-ctrls: add v4l2_fh pointer to the set control functions
When an application changes a control you want to generate an event. However, you want to avoid sending such an event back to the application (file handle) that caused the change. Add the filehandle to the various set control functions. The filehandle isn't used yet, but the control event patches will need this. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/v4l2-ctrls.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 56323e341e02..e720f11a56fd 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -28,6 +28,7 @@
28/* forward references */ 28/* forward references */
29struct v4l2_ctrl_handler; 29struct v4l2_ctrl_handler;
30struct v4l2_ctrl; 30struct v4l2_ctrl;
31struct v4l2_fh;
31struct video_device; 32struct video_device;
32struct v4l2_subdev; 33struct v4l2_subdev;
33 34
@@ -485,15 +486,16 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
485 */ 486 */
486int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val); 487int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
487 488
488
489/* Helpers for ioctl_ops. If hdl == NULL then they will all return -EINVAL. */ 489/* Helpers for ioctl_ops. If hdl == NULL then they will all return -EINVAL. */
490int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc); 490int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc);
491int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm); 491int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm);
492int v4l2_g_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_control *ctrl); 492int v4l2_g_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_control *ctrl);
493int v4l2_s_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_control *ctrl); 493int v4l2_s_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
494 struct v4l2_control *ctrl);
494int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *c); 495int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *c);
495int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *c); 496int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *c);
496int v4l2_s_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *c); 497int v4l2_s_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
498 struct v4l2_ext_controls *c);
497 499
498/* Helpers for subdevices. If the associated ctrl_handler == NULL then they 500/* Helpers for subdevices. If the associated ctrl_handler == NULL then they
499 will all return -EINVAL. */ 501 will all return -EINVAL. */