aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-13 07:48:21 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:46 -0300
commit1b6f1d9603a46a73ceed8daf7a3285559727fec3 (patch)
treeaa6a3cfbd2a136f8695007a7b78aa6023c60938b /include/media
parentee6f78cd03caae54baafb2e79a39b4aee90e6931 (diff)
downloadkernel_samsung_smdk4412-1b6f1d9603a46a73ceed8daf7a3285559727fec3.zip
kernel_samsung_smdk4412-1b6f1d9603a46a73ceed8daf7a3285559727fec3.tar.gz
kernel_samsung_smdk4412-1b6f1d9603a46a73ceed8daf7a3285559727fec3.tar.bz2
V4L/DVB (10542): v4l2-subdev: add querystd and g_input_status
In order to convert the v4l1 zoran and vino i2c drivers to v4l2 these extra ops are required. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-common.h3
-rw-r--r--include/media/v4l2-subdev.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 0f864f8..1637cc3 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -297,4 +297,7 @@ struct v4l2_crystal_freq {
a v4l2_gpio struct if a direction is also needed. */
#define VIDIOC_INT_S_GPIO _IOW('d', 117, u32)
+/* Get input status. Same as the status field in the v4l2_input struct. */
+#define VIDIOC_INT_G_INPUT_STATUS _IOR('d', 118, u32)
+
#endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 9c1663d..cd640c6 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -115,6 +115,8 @@ struct v4l2_subdev_video_ops {
int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
+ int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
+ int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
int (*s_stream)(struct v4l2_subdev *sd, int enable);
int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);