From 07f9308bc10f6195098ae593456bbee2f6b2a3a3 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 07:48:21 -0300 Subject: [PATCH] --- yaml --- r: 137887 b: refs/heads/master c: 1b6f1d9603a46a73ceed8daf7a3285559727fec3 h: refs/heads/master i: 137885: 2aaea77f39870a2637723b788a78422cbd64fea5 137883: 970a49658d2639a00379a66dde6478382137442b 137879: 3412b1c86d1e12998000c6aab80c939eadd7abfd 137871: 1030877da4bfd6f62cf8ecae3d2437b367354c9f 137855: 26be4525e66a0d68afd6ee1ebb09b11614aafaba v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-subdev.c | 4 ++++ trunk/include/media/v4l2-common.h | 3 +++ trunk/include/media/v4l2-subdev.h | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 35de2fb97431..9e5c3e8eba65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee6f78cd03caae54baafb2e79a39b4aee90e6931 +refs/heads/master: 1b6f1d9603a46a73ceed8daf7a3285559727fec3 diff --git a/trunk/drivers/media/video/v4l2-subdev.c b/trunk/drivers/media/video/v4l2-subdev.c index 158bc55de166..923ec8d01991 100644 --- a/trunk/drivers/media/video/v4l2-subdev.c +++ b/trunk/drivers/media/video/v4l2-subdev.c @@ -104,6 +104,10 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) return v4l2_subdev_call(sd, video, g_fmt, arg); case VIDIOC_INT_S_STD_OUTPUT: return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg); + case VIDIOC_QUERYSTD: + return v4l2_subdev_call(sd, video, querystd, arg); + case VIDIOC_INT_G_INPUT_STATUS: + return v4l2_subdev_call(sd, video, g_input_status, arg); case VIDIOC_STREAMON: return v4l2_subdev_call(sd, video, s_stream, 1); case VIDIOC_STREAMOFF: diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h index 0f864f8daaf2..1637cc302697 100644 --- a/trunk/include/media/v4l2-common.h +++ b/trunk/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/trunk/include/media/v4l2-subdev.h b/trunk/include/media/v4l2-subdev.h index 9c1663d91224..cd640c6f039b 100644 --- a/trunk/include/media/v4l2-subdev.h +++ b/trunk/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);