aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-vbi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-20 11:58:33 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:44 -0500
commit63ab1bdc3b98b804f69bd345b1e3a491804c12de (patch)
treefc8aed8e06698de61bd16da9f3b71b71c461923d /drivers/media/video/cx88/cx88-vbi.c
parente90311a198e21902cda4fd4cac8e09bc6ce52603 (diff)
V4L/DVB (5102): make videodev to auto-generate standards
v4l2_tvnorm were meant to describe video standards and its names to V4L2 API. However, this were doing by some static structures at the driver. This patch changes the internals in a way that, at the driver, only a v4l2_tvnorm (a 64 bit integer) should be filled, with all supported tvnorms. videodev will dynamically generate the proper API array based on supported standards. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-vbi.c')
-rw-r--r--drivers/media/video/cx88/cx88-vbi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index b6b968851d71..86c1cf8334bc 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -33,13 +33,13 @@ int cx8800_vbi_fmt (struct file *file, void *priv,
33 f->fmt.vbi.count[0] = VBI_LINE_COUNT; 33 f->fmt.vbi.count[0] = VBI_LINE_COUNT;
34 f->fmt.vbi.count[1] = VBI_LINE_COUNT; 34 f->fmt.vbi.count[1] = VBI_LINE_COUNT;
35 35
36 if (dev->core->tvnorm->id & V4L2_STD_525_60) { 36 if (dev->core->tvnorm & V4L2_STD_525_60) {
37 /* ntsc */ 37 /* ntsc */
38 f->fmt.vbi.sampling_rate = 28636363; 38 f->fmt.vbi.sampling_rate = 28636363;
39 f->fmt.vbi.start[0] = 10; 39 f->fmt.vbi.start[0] = 10;
40 f->fmt.vbi.start[1] = 273; 40 f->fmt.vbi.start[1] = 273;
41 41
42 } else if (dev->core->tvnorm->id & V4L2_STD_625_50) { 42 } else if (dev->core->tvnorm & V4L2_STD_625_50) {
43 /* pal */ 43 /* pal */
44 f->fmt.vbi.sampling_rate = 35468950; 44 f->fmt.vbi.sampling_rate = 35468950;
45 f->fmt.vbi.start[0] = 7 -1; 45 f->fmt.vbi.start[0] = 7 -1;