V4L/DVB: cx18: switch to new vbi subdev ops
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
4ff0790b6d
commit
add632cd25
@@ -208,7 +208,7 @@ static int cx18_g_fmt_sliced_vbi_cap(struct file *file, void *fh,
|
|||||||
* digitizer/slicer. Note, cx18_av_vbi() wipes the passed in
|
* digitizer/slicer. Note, cx18_av_vbi() wipes the passed in
|
||||||
* fmt->fmt.sliced under valid calling conditions
|
* fmt->fmt.sliced under valid calling conditions
|
||||||
*/
|
*/
|
||||||
if (v4l2_subdev_call(cx->sd_av, video, g_fmt, fmt))
|
if (v4l2_subdev_call(cx->sd_av, vbi, g_sliced_fmt, &fmt->fmt.sliced))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Ensure V4L2 spec compliant output */
|
/* Ensure V4L2 spec compliant output */
|
||||||
@@ -322,7 +322,7 @@ static int cx18_s_fmt_vbi_cap(struct file *file, void *fh,
|
|||||||
* Note cx18_av_vbi_wipes out alot of the passed in fmt under valid
|
* Note cx18_av_vbi_wipes out alot of the passed in fmt under valid
|
||||||
* calling conditions
|
* calling conditions
|
||||||
*/
|
*/
|
||||||
ret = v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt);
|
ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@@ -359,7 +359,7 @@ static int cx18_s_fmt_sliced_vbi_cap(struct file *file, void *fh,
|
|||||||
* Note, cx18_av_vbi() wipes some "impossible" service lines in the
|
* Note, cx18_av_vbi() wipes some "impossible" service lines in the
|
||||||
* passed in fmt->fmt.sliced under valid calling conditions
|
* passed in fmt->fmt.sliced under valid calling conditions
|
||||||
*/
|
*/
|
||||||
ret = v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt);
|
ret = v4l2_subdev_call(cx->sd_av, vbi, s_sliced_fmt, &fmt->fmt.sliced);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
/* Store our current v4l2 sliced VBI settings */
|
/* Store our current v4l2 sliced VBI settings */
|
||||||
|
@@ -374,7 +374,10 @@ static void cx18_vbi_setup(struct cx18_stream *s)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* setup VBI registers */
|
/* setup VBI registers */
|
||||||
v4l2_subdev_call(cx->sd_av, video, s_fmt, &cx->vbi.in);
|
if (raw)
|
||||||
|
v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &cx->vbi.in.fmt.vbi);
|
||||||
|
else
|
||||||
|
v4l2_subdev_call(cx->sd_av, vbi, s_sliced_fmt, &cx->vbi.in.fmt.sliced);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Send the CX18_CPU_SET_RAW_VBI_PARAM API command to setup Encoder Raw
|
* Send the CX18_CPU_SET_RAW_VBI_PARAM API command to setup Encoder Raw
|
||||||
|
Reference in New Issue
Block a user