diff options
author | Andy Walls <awalls@radix.net> | 2009-02-28 21:06:08 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:09 -0400 |
commit | cb95a40e54b96938c2e81de6a95609e915922962 (patch) | |
tree | d90d6b70cb31c2fdd9f8aea41570bceae6cd259f /drivers/media/video/cx18/cx18-av-vbi.c | |
parent | af7c58b1f5014bea181ef74d724ac960923dd403 (diff) |
V4L/DVB (10855): cx18: Fix VPS service register codes
Based on a documentation clarification from Conexant, fix the register code
used for sliced VBI VPS service.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-av-vbi.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-av-vbi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-av-vbi.c b/drivers/media/video/cx18/cx18-av-vbi.c index 43267d1afb9..27699839b80 100644 --- a/drivers/media/video/cx18/cx18-av-vbi.c +++ b/drivers/media/video/cx18/cx18-av-vbi.c | |||
@@ -142,7 +142,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg) | |||
142 | 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ | 142 | 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ |
143 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ | 143 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ |
144 | V4L2_SLICED_CAPTION_525, /* 6 */ | 144 | V4L2_SLICED_CAPTION_525, /* 6 */ |
145 | V4L2_SLICED_VPS, 0, 0, 0, 0, /* 7 - unlike cx25840 */ | 145 | 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ |
146 | 0, 0, 0, 0 | 146 | 0, 0, 0, 0 |
147 | }; | 147 | }; |
148 | int is_pal = !(state->std & V4L2_STD_525_60); | 148 | 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) | |||
243 | lcr[i] |= 6 << (4 * x); | 243 | lcr[i] |= 6 << (4 * x); |
244 | break; | 244 | break; |
245 | case V4L2_SLICED_VPS: | 245 | case V4L2_SLICED_VPS: |
246 | lcr[i] |= 7 << (4 * x); /*'840 differs*/ | 246 | lcr[i] |= 9 << (4 * x); |
247 | break; | 247 | break; |
248 | } | 248 | } |
249 | } | 249 | } |
@@ -301,7 +301,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg) | |||
301 | sdid = V4L2_SLICED_CAPTION_525; | 301 | sdid = V4L2_SLICED_CAPTION_525; |
302 | err = !odd_parity(p[0]) || !odd_parity(p[1]); | 302 | err = !odd_parity(p[0]) || !odd_parity(p[1]); |
303 | break; | 303 | break; |
304 | case 7: /* Differs from cx25840 */ | 304 | case 9: |
305 | sdid = V4L2_SLICED_VPS; | 305 | sdid = V4L2_SLICED_VPS; |
306 | if (decode_vps(p, p) != 0) | 306 | if (decode_vps(p, p) != 0) |
307 | err = 1; | 307 | err = 1; |