Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 313fce75 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] fixes and add querystd support to mxb 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ab49ae0f

drivers/media/dvb/ttpci/av7110_v4l.c

+10 −0
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/mxb.c

+8 −0
Original line number Diff line number Diff line
@@ -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;