From 313fce750a073b041526f6e595f755f6233f8e73 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 1 May 2012 13:13:49 -0300 Subject: [PATCH] [media] fixes and add querystd support to mxb Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/ttpci/av7110_v4l.c | 10 ++++++++++ drivers/media/video/mxb.c | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index f1dc6e76a6a1..3b7a624b5e9f 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c @@ -811,6 +811,16 @@ int av7110_init_v4l(struct av7110 *av7110) vv_data->vid_ops.vidioc_s_frequency = vidioc_s_frequency; vv_data->vid_ops.vidioc_g_audio = vidioc_g_audio; vv_data->vid_ops.vidioc_s_audio = vidioc_s_audio; + + vv_data->vbi_ops.vidioc_enum_input = vidioc_enum_input; + vv_data->vbi_ops.vidioc_g_input = vidioc_g_input; + vv_data->vbi_ops.vidioc_s_input = vidioc_s_input; + vv_data->vbi_ops.vidioc_g_tuner = vidioc_g_tuner; + vv_data->vbi_ops.vidioc_s_tuner = vidioc_s_tuner; + vv_data->vbi_ops.vidioc_g_frequency = vidioc_g_frequency; + vv_data->vbi_ops.vidioc_s_frequency = vidioc_s_frequency; + vv_data->vbi_ops.vidioc_g_audio = vidioc_g_audio; + vv_data->vbi_ops.vidioc_s_audio = vidioc_s_audio; vv_data->vbi_ops.vidioc_g_sliced_vbi_cap = vidioc_g_sliced_vbi_cap; vv_data->vbi_ops.vidioc_g_fmt_sliced_vbi_out = vidioc_g_fmt_sliced_vbi_out; vv_data->vbi_ops.vidioc_s_fmt_sliced_vbi_out = vidioc_s_fmt_sliced_vbi_out; diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index d2d261291158..b520a45cb3f3 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c @@ -575,6 +575,13 @@ static int vidioc_s_tuner(struct file *file, void *fh, struct v4l2_tuner *t) return call_all(dev, tuner, s_tuner, t); } +static int vidioc_querystd(struct file *file, void *fh, v4l2_std_id *norm) +{ + struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; + + return call_all(dev, video, querystd, norm); +} + static int vidioc_g_frequency(struct file *file, void *fh, struct v4l2_frequency *f) { struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; @@ -707,6 +714,7 @@ static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input; vv_data.vid_ops.vidioc_g_input = vidioc_g_input; vv_data.vid_ops.vidioc_s_input = vidioc_s_input; + vv_data.vid_ops.vidioc_querystd = vidioc_querystd; vv_data.vid_ops.vidioc_g_tuner = vidioc_g_tuner; vv_data.vid_ops.vidioc_s_tuner = vidioc_s_tuner; vv_data.vid_ops.vidioc_g_frequency = vidioc_g_frequency; -- 2.30.2