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

Commit 4ff0790b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: ivtv: switch to new vbi subdev ops 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d37dad49

drivers/media/video/ivtv/ivtv-ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo 
		return 0;

	}



	v4l2_subdev_call(itv->sd_video, video, g_fmt, fmt);

	v4l2_subdev_call(itv->sd_video, vbi, g_sliced_fmt, vbifmt);

	vbifmt->service_set = ivtv_get_service_set(vbifmt);

	return 0;

}
@@ -598,7 +598,7 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f 
		return -EBUSY;

	itv->vbi.sliced_in->service_set = 0;

	itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;

	v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt);

	v4l2_subdev_call(itv->sd_video, vbi, s_raw_fmt, &fmt->fmt.vbi);

	return ivtv_g_fmt_vbi_cap(file, fh, fmt);

}
@@ -616,7 +616,7 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo 
	if (ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)

		return -EBUSY;

	itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;

	v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt);

	v4l2_subdev_call(itv->sd_video, vbi, s_sliced_fmt, vbifmt);

	memcpy(itv->vbi.sliced_in, vbifmt, sizeof(*itv->vbi.sliced_in));

	return 0;

}

drivers/media/video/ivtv/ivtv-streams.c

+4 −1
Original line number Diff line number Diff line
@@ -344,7 +344,10 @@ static void ivtv_vbi_setup(struct ivtv *itv) 
	ivtv_vapi(itv, CX2341X_ENC_SET_VBI_LINE, 5, 0xffff , 0, 0, 0, 0);



	/* setup VBI registers */

	v4l2_subdev_call(itv->sd_video, video, s_fmt, &itv->vbi.in);

	if (raw)

		v4l2_subdev_call(itv->sd_video, vbi, s_raw_fmt, &itv->vbi.in.fmt.vbi);

	else

		v4l2_subdev_call(itv->sd_video, vbi, s_sliced_fmt, &itv->vbi.in.fmt.sliced);



	/* determine number of lines and total number of VBI bytes.

	   A raw line takes 1443 bytes: 2 * 720 + 4 byte frame header - 1