The patch number 10543 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/v4l2-subdev.c | 4 ++++
linux/include/media/v4l2-common.h | 3 +++
linux/include/media/v4l2-subdev.h | 2 ++
3 files changed, 9 insertions(+)
diff -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/drivers/media/video/v4l2-subdev.c
--- a/linux/drivers/media/video/v4l2-subdev.c Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/drivers/media/video/v4l2-subdev.c Fri Feb 13 18:19:36 2009 -0200
@@ -104,6 +104,10 @@ int v4l2_subdev_command(struct v4l2_subd
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 -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/include/media/v4l2-common.h
--- a/linux/include/media/v4l2-common.h Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/include/media/v4l2-common.h Fri Feb 13 18:19:36 2009 -0200
@@ -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 -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/include/media/v4l2-subdev.h
--- a/linux/include/media/v4l2-subdev.h Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/include/media/v4l2-subdev.h Fri Feb 13 18:19:36 2009 -0200
@@ -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);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/84cbcf049b92c9caffe00bde5ccdaa36e7e4c8bc
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
