diff options
| author | Andy Walls <awalls@radix.net> | 2009-02-28 21:06:08 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-02-28 21:06:08 -0500 |
| commit | 85609544aa42593842578f8281caaa4c1c5ca7c5 (patch) | |
| tree | e6c835f3ca64b754c4268d88f5c1ba06704d1965 /linux/drivers/media/video | |
| parent | 597bd5dbc2ff24bbdd148fb698bc9a3d9daad61c (diff) | |
| download | mediapointer-dvb-s2-85609544aa42593842578f8281caaa4c1c5ca7c5.tar.gz mediapointer-dvb-s2-85609544aa42593842578f8281caaa4c1c5ca7c5.tar.bz2 | |
cx18: Fix VPS service register codes
From: Andy Walls <awalls@radix.net>
Based on a documentation clarification from Conexant, fix the register code
used for sliced VBI VPS service.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-vbi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-vbi.c b/linux/drivers/media/video/cx18/cx18-av-vbi.c index 43267d1af..27699839b 100644 --- a/linux/drivers/media/video/cx18/cx18-av-vbi.c +++ b/linux/drivers/media/video/cx18/cx18-av-vbi.c @@ -142,7 +142,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg) 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ 0, V4L2_SLICED_WSS_625, 0, /* 4 */ V4L2_SLICED_CAPTION_525, /* 6 */ - V4L2_SLICED_VPS, 0, 0, 0, 0, /* 7 - unlike cx25840 */ + 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ 0, 0, 0, 0 }; int is_pal = !(state->std & V4L2_STD_525_60); @@ -243,7 +243,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg) lcr[i] |= 6 << (4 * x); break; case V4L2_SLICED_VPS: - lcr[i] |= 7 << (4 * x); /*'840 differs*/ + lcr[i] |= 9 << (4 * x); break; } } @@ -301,7 +301,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg) sdid = V4L2_SLICED_CAPTION_525; err = !odd_parity(p[0]) || !odd_parity(p[1]); break; - case 7: /* Differs from cx25840 */ + case 9: sdid = V4L2_SLICED_VPS; if (decode_vps(p, p) != 0) err = 1; |