diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-29 16:02:51 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:56:04 -0400 |
commit | 9bc7400a9d01b1fe05c7f0200e7384e17794f6e4 (patch) | |
tree | 7dad2e13853c3ba7c2e913e2ee40229b1474155a /drivers/media/video | |
parent | 2868c41fc45399b0f0855eb760e1a81881ff0c3d (diff) |
V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
The sliced VBI defines added in videodev2.h are removed since requires
more discussion.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-vbi.c | 6 | ||||
-rw-r--r-- | drivers/media/video/saa7115.c | 6 | ||||
-rw-r--r-- | drivers/media/video/tvp5150.c | 10 |
3 files changed, 15 insertions, 7 deletions
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c index f5784589b270..57feca288d2b 100644 --- a/drivers/media/video/cx25840/cx25840-vbi.c +++ b/drivers/media/video/cx25840/cx25840-vbi.c | |||
@@ -152,7 +152,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
152 | case VIDIOC_G_FMT: | 152 | case VIDIOC_G_FMT: |
153 | { | 153 | { |
154 | static u16 lcr2vbi[] = { | 154 | static u16 lcr2vbi[] = { |
155 | 0, V4L2_SLICED_TELETEXT_PAL_B, 0, /* 1 */ | 155 | 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ |
156 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ | 156 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ |
157 | V4L2_SLICED_CAPTION_525, /* 6 */ | 157 | V4L2_SLICED_CAPTION_525, /* 6 */ |
158 | 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ | 158 | 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ |
@@ -232,7 +232,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
232 | for (i = 7; i <= 23; i++) { | 232 | for (i = 7; i <= 23; i++) { |
233 | for (x = 0; x <= 1; x++) { | 233 | for (x = 0; x <= 1; x++) { |
234 | switch (svbi->service_lines[1-x][i]) { | 234 | switch (svbi->service_lines[1-x][i]) { |
235 | case V4L2_SLICED_TELETEXT_PAL_B: | 235 | case V4L2_SLICED_TELETEXT_B: |
236 | lcr[i] |= 1 << (4 * x); | 236 | lcr[i] |= 1 << (4 * x); |
237 | break; | 237 | break; |
238 | case V4L2_SLICED_WSS_625: | 238 | case V4L2_SLICED_WSS_625: |
@@ -283,7 +283,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
283 | 283 | ||
284 | switch (id2) { | 284 | switch (id2) { |
285 | case 1: | 285 | case 1: |
286 | id2 = V4L2_SLICED_TELETEXT_PAL_B; | 286 | id2 = V4L2_SLICED_TELETEXT_B; |
287 | break; | 287 | break; |
288 | case 4: | 288 | case 4: |
289 | id2 = V4L2_SLICED_WSS_625; | 289 | id2 = V4L2_SLICED_WSS_625; |
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index 615ec903355a..dceebc0b1250 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
@@ -852,7 +852,7 @@ static void saa7115_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo | |||
852 | case 0: | 852 | case 0: |
853 | lcr[i] |= 0xf << (4 * x); | 853 | lcr[i] |= 0xf << (4 * x); |
854 | break; | 854 | break; |
855 | case V4L2_SLICED_TELETEXT_PAL_B: | 855 | case V4L2_SLICED_TELETEXT_B: |
856 | lcr[i] |= 1 << (4 * x); | 856 | lcr[i] |= 1 << (4 * x); |
857 | break; | 857 | break; |
858 | case V4L2_SLICED_CAPTION_525: | 858 | case V4L2_SLICED_CAPTION_525: |
@@ -881,7 +881,7 @@ static void saa7115_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo | |||
881 | static int saa7115_get_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) | 881 | static int saa7115_get_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) |
882 | { | 882 | { |
883 | static u16 lcr2vbi[] = { | 883 | static u16 lcr2vbi[] = { |
884 | 0, V4L2_SLICED_TELETEXT_PAL_B, 0, /* 1 */ | 884 | 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ |
885 | 0, V4L2_SLICED_CAPTION_525, /* 4 */ | 885 | 0, V4L2_SLICED_CAPTION_525, /* 4 */ |
886 | V4L2_SLICED_WSS_625, 0, /* 5 */ | 886 | V4L2_SLICED_WSS_625, 0, /* 5 */ |
887 | V4L2_SLICED_VPS, 0, 0, 0, 0, /* 7 */ | 887 | V4L2_SLICED_VPS, 0, 0, 0, 0, /* 7 */ |
@@ -1046,7 +1046,7 @@ static void saa7115_decode_vbi_line(struct i2c_client *client, | |||
1046 | /* decode payloads */ | 1046 | /* decode payloads */ |
1047 | switch (id2) { | 1047 | switch (id2) { |
1048 | case 1: | 1048 | case 1: |
1049 | vbi->type = V4L2_SLICED_TELETEXT_PAL_B; | 1049 | vbi->type = V4L2_SLICED_TELETEXT_B; |
1050 | break; | 1050 | break; |
1051 | case 4: | 1051 | case 4: |
1052 | if (!saa7115_odd_parity(p[0]) || !saa7115_odd_parity(p[1])) | 1052 | if (!saa7115_odd_parity(p[0]) || !saa7115_odd_parity(p[1])) |
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index d4f4ef3323e8..1055423aa2b9 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -500,16 +500,21 @@ struct i2c_vbi_ram_value { | |||
500 | 500 | ||
501 | static struct i2c_vbi_ram_value vbi_ram_default[] = | 501 | static struct i2c_vbi_ram_value vbi_ram_default[] = |
502 | { | 502 | { |
503 | /* FIXME: Current api doesn't handle all VBI types, those not | ||
504 | yet supported are placed under #if 0 */ | ||
505 | #if 0 | ||
503 | {0x010, /* Teletext, SECAM, WST System A */ | 506 | {0x010, /* Teletext, SECAM, WST System A */ |
504 | {V4L2_SLICED_TELETEXT_SECAM,6,23,1}, | 507 | {V4L2_SLICED_TELETEXT_SECAM,6,23,1}, |
505 | { 0xaa, 0xaa, 0xff, 0xff, 0xe7, 0x2e, 0x20, 0x26, | 508 | { 0xaa, 0xaa, 0xff, 0xff, 0xe7, 0x2e, 0x20, 0x26, |
506 | 0xe6, 0xb4, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x00 } | 509 | 0xe6, 0xb4, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x00 } |
507 | }, | 510 | }, |
511 | #endif | ||
508 | {0x030, /* Teletext, PAL, WST System B */ | 512 | {0x030, /* Teletext, PAL, WST System B */ |
509 | {V4L2_SLICED_TELETEXT_PAL_B,6,22,1}, | 513 | {V4L2_SLICED_TELETEXT_B,6,22,1}, |
510 | { 0xaa, 0xaa, 0xff, 0xff, 0x27, 0x2e, 0x20, 0x2b, | 514 | { 0xaa, 0xaa, 0xff, 0xff, 0x27, 0x2e, 0x20, 0x2b, |
511 | 0xa6, 0x72, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00 } | 515 | 0xa6, 0x72, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00 } |
512 | }, | 516 | }, |
517 | #if 0 | ||
513 | {0x050, /* Teletext, PAL, WST System C */ | 518 | {0x050, /* Teletext, PAL, WST System C */ |
514 | {V4L2_SLICED_TELETEXT_PAL_C,6,22,1}, | 519 | {V4L2_SLICED_TELETEXT_PAL_C,6,22,1}, |
515 | { 0xaa, 0xaa, 0xff, 0xff, 0xe7, 0x2e, 0x20, 0x22, | 520 | { 0xaa, 0xaa, 0xff, 0xff, 0xe7, 0x2e, 0x20, 0x22, |
@@ -535,6 +540,7 @@ static struct i2c_vbi_ram_value vbi_ram_default[] = | |||
535 | { 0xaa, 0x2a, 0xff, 0x3f, 0x04, 0x51, 0x6e, 0x02, | 540 | { 0xaa, 0x2a, 0xff, 0x3f, 0x04, 0x51, 0x6e, 0x02, |
536 | 0xa6, 0x7b, 0x09, 0x00, 0x00, 0x00, 0x27, 0x00 } | 541 | 0xa6, 0x7b, 0x09, 0x00, 0x00, 0x00, 0x27, 0x00 } |
537 | }, | 542 | }, |
543 | #endif | ||
538 | {0x0f0, /* Closed Caption, NTSC */ | 544 | {0x0f0, /* Closed Caption, NTSC */ |
539 | {V4L2_SLICED_CAPTION_525,21,21,1}, | 545 | {V4L2_SLICED_CAPTION_525,21,21,1}, |
540 | { 0xaa, 0x2a, 0xff, 0x3f, 0x04, 0x51, 0x6e, 0x02, | 546 | { 0xaa, 0x2a, 0xff, 0x3f, 0x04, 0x51, 0x6e, 0x02, |
@@ -545,6 +551,7 @@ static struct i2c_vbi_ram_value vbi_ram_default[] = | |||
545 | { 0x5b, 0x55, 0xc5, 0xff, 0x00, 0x71, 0x6e, 0x42, | 551 | { 0x5b, 0x55, 0xc5, 0xff, 0x00, 0x71, 0x6e, 0x42, |
546 | 0xa6, 0xcd, 0x0f, 0x00, 0x00, 0x00, 0x3a, 0x00 } | 552 | 0xa6, 0xcd, 0x0f, 0x00, 0x00, 0x00, 0x3a, 0x00 } |
547 | }, | 553 | }, |
554 | #if 0 | ||
548 | {0x130, /* Wide Screen Signal, NTSC C */ | 555 | {0x130, /* Wide Screen Signal, NTSC C */ |
549 | {V4L2_SLICED_WSS_525,20,20,1}, | 556 | {V4L2_SLICED_WSS_525,20,20,1}, |
550 | { 0x38, 0x00, 0x3f, 0x00, 0x00, 0x71, 0x6e, 0x43, | 557 | { 0x38, 0x00, 0x3f, 0x00, 0x00, 0x71, 0x6e, 0x43, |
@@ -560,6 +567,7 @@ static struct i2c_vbi_ram_value vbi_ram_default[] = | |||
560 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x6d, 0x49, | 567 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x6d, 0x49, |
561 | 0x69, 0x94, 0x08, 0x00, 0x00, 0x00, 0x4c, 0x00 } | 568 | 0x69, 0x94, 0x08, 0x00, 0x00, 0x00, 0x4c, 0x00 } |
562 | }, | 569 | }, |
570 | #endif | ||
563 | {0x190, /* Video Program System (VPS), PAL */ | 571 | {0x190, /* Video Program System (VPS), PAL */ |
564 | {V4L2_SLICED_VPS,16,16,0}, | 572 | {V4L2_SLICED_VPS,16,16,0}, |
565 | { 0xaa, 0xaa, 0xff, 0xff, 0xba, 0xce, 0x2b, 0x0d, | 573 | { 0xaa, 0xaa, 0xff, 0xff, 0xba, 0xce, 0x2b, 0x0d, |