diff options
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r-- | include/media/v4l2-ctrls.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index eeb3df637144..11e67562b3ac 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #define _V4L2_CTRLS_H | 22 | #define _V4L2_CTRLS_H |
23 | 23 | ||
24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
25 | #include <linux/device.h> | ||
26 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
27 | 26 | ||
28 | /* forward references */ | 27 | /* forward references */ |
@@ -33,6 +32,7 @@ struct video_device; | |||
33 | struct v4l2_subdev; | 32 | struct v4l2_subdev; |
34 | struct v4l2_subscribed_event; | 33 | struct v4l2_subscribed_event; |
35 | struct v4l2_fh; | 34 | struct v4l2_fh; |
35 | struct poll_table_struct; | ||
36 | 36 | ||
37 | /** struct v4l2_ctrl_ops - The control operations that the driver has to provide. | 37 | /** struct v4l2_ctrl_ops - The control operations that the driver has to provide. |
38 | * @g_volatile_ctrl: Get a new value for this control. Generally only relevant | 38 | * @g_volatile_ctrl: Get a new value for this control. Generally only relevant |
@@ -492,6 +492,18 @@ void v4l2_ctrl_add_event(struct v4l2_ctrl *ctrl, | |||
492 | void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl, | 492 | void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl, |
493 | struct v4l2_subscribed_event *sev); | 493 | struct v4l2_subscribed_event *sev); |
494 | 494 | ||
495 | /* Can be used as a vidioc_log_status function that just dumps all controls | ||
496 | associated with the filehandle. */ | ||
497 | int v4l2_ctrl_log_status(struct file *file, void *fh); | ||
498 | |||
499 | /* Can be used as a vidioc_subscribe_event function that just subscribes | ||
500 | control events. */ | ||
501 | int v4l2_ctrl_subscribe_event(struct v4l2_fh *fh, | ||
502 | struct v4l2_event_subscription *sub); | ||
503 | |||
504 | /* Can be used as a poll function that just polls for control events. */ | ||
505 | unsigned int v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait); | ||
506 | |||
495 | /* Helpers for ioctl_ops. If hdl == NULL then they will all return -EINVAL. */ | 507 | /* Helpers for ioctl_ops. If hdl == NULL then they will all return -EINVAL. */ |
496 | int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc); | 508 | int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc); |
497 | int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm); | 509 | int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm); |