diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-25 14:09:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:07:14 -0400 |
commit | effa0b08633122cc63d2b7f098434d359d5767ef (patch) | |
tree | da7c8adb8e011921df45d77c07bad85cb7927c52 /drivers/media/video/ivtv/ivtv-streams.c | |
parent | 2f3a98931f51be6093df7c6cc2633bf238778b7d (diff) |
V4L/DVB (6117): ivtv: finish VBI related cleanup
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index a3296224f821..fd135985e70f 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -321,16 +321,6 @@ static void ivtv_vbi_setup(struct ivtv *itv) | |||
321 | /* Reset VBI */ | 321 | /* Reset VBI */ |
322 | ivtv_vapi(itv, CX2341X_ENC_SET_VBI_LINE, 5, 0xffff , 0, 0, 0, 0); | 322 | ivtv_vapi(itv, CX2341X_ENC_SET_VBI_LINE, 5, 0xffff , 0, 0, 0, 0); |
323 | 323 | ||
324 | if (itv->is_60hz) { | ||
325 | itv->vbi.count = 12; | ||
326 | itv->vbi.start[0] = 10; | ||
327 | itv->vbi.start[1] = 273; | ||
328 | } else { /* PAL/SECAM */ | ||
329 | itv->vbi.count = 18; | ||
330 | itv->vbi.start[0] = 6; | ||
331 | itv->vbi.start[1] = 318; | ||
332 | } | ||
333 | |||
334 | /* setup VBI registers */ | 324 | /* setup VBI registers */ |
335 | itv->video_dec_func(itv, VIDIOC_S_FMT, &itv->vbi.in); | 325 | itv->video_dec_func(itv, VIDIOC_S_FMT, &itv->vbi.in); |
336 | 326 | ||