renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840.

Browse Source 
VIDIOC_G_FMT returned the sliced VBI types in the wrong lines for NTSC
(three lines too low).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2006-10-07 16:22:10 -03:00 committed by Mauro Carvalho Chehab
parent 2e7cf3ea5a
commit e0abc8cd54
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/video/cx25840/cx25840-vbi.c
View File

@ -235,6 +235,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */
0, 0, 0, 0 0, 0, 0, 0
}; };
int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
int i; int i;
fmt = arg; fmt = arg;
@ -246,13 +247,25 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
if ((cx25840_read(client, 0x404) & 0x10) == 0) if ((cx25840_read(client, 0x404) & 0x10) == 0)
break; break;
for (i = 7; i <= 23; i++) { if (is_pal) {
u8 v = cx25840_read(client, 0x424 + i - 7); for (i = 7; i <= 23; i++) {
u8 v = cx25840_read(client, 0x424 + i - 7);
svbi->service_lines[0][i] = lcr2vbi[v >> 4]; svbi->service_lines[0][i] = lcr2vbi[v >> 4];
svbi->service_lines[1][i] = lcr2vbi[v & 0xf]; svbi->service_lines[1][i] = lcr2vbi[v & 0xf];
svbi->service_set |= svbi->service_set |=
svbi->service_lines[0][i] | svbi->service_lines[1][i]; svbi->service_lines[0][i] | svbi->service_lines[1][i];
}
}
else {
for (i = 10; i <= 21; i++) {
u8 v = cx25840_read(client, 0x424 + i - 10);
svbi->service_lines[0][i] = lcr2vbi[v >> 4];
svbi->service_lines[1][i] = lcr2vbi[v & 0xf];
svbi->service_set |=
svbi->service_lines[0][i] | svbi->service_lines[1][i];
}
} }
break; break;
} }