diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-01 13:13:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 15:01:04 -0300 |
| commit | 313fce750a073b041526f6e595f755f6233f8e73 (patch) | |
| tree | a82adbd1b0becdb090d05953d76ddb2d1bc458b6 | |
| parent | ab49ae0f201f1e7e07250d011fffde8ed2530175 (diff) | |
[media] fixes and add querystd support to mxb
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_v4l.c | 10 | ||||
| -rw-r--r-- | drivers/media/video/mxb.c | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index f1dc6e76a6a..3b7a624b5e9 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 d2d26129115..b520a45cb3f 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; |