diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-29 13:40:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-29 13:40:05 -0300 |
| commit | 7272f8f51ed77805115b9716b72ab4b6d3db0049 (patch) | |
| tree | b03dc6cd16c08a74111809ff5d344d895b5423f0 /linux | |
| parent | 6cf42c0905015627422b155a89b3b9603d93a9fe (diff) | |
| parent | 1bc74ef4bf86bfa8ba1b9755e226829b54e28826 (diff) | |
| download | mediapointer-dvb-s2-7272f8f51ed77805115b9716b72ab4b6d3db0049.tar.gz mediapointer-dvb-s2-7272f8f51ed77805115b9716b72ab4b6d3db0049.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-vbi.c | 15 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-vbi.c b/linux/drivers/media/video/bt8xx/bttv-vbi.c index 8c9f0f7cf..63676e7bd 100644 --- a/linux/drivers/media/video/bt8xx/bttv-vbi.c +++ b/linux/drivers/media/video/bt8xx/bttv-vbi.c @@ -31,11 +31,16 @@ #include <asm/io.h> #include "bttvp.h" -/* Offset from line sync pulse leading edge (0H) in 1 / sampling_rate: - bt8x8 /HRESET pulse starts at 0H and has length 64 / fCLKx1 (E|O_VTC - HSFMT = 0). VBI_HDELAY (always 0) is an offset from the trailing edge - of /HRESET in 1 / fCLKx1, and the sampling_rate tvnorm->Fsc is fCLKx2. */ -#define VBI_OFFSET ((64 + 0) * 2) +/* Offset from line sync pulse leading edge (0H) to start of VBI capture, + in fCLKx2 pixels. According to the datasheet, VBI capture starts + VBI_HDELAY fCLKx1 pixels from the tailing edgeof /HRESET, and /HRESET + is 64 fCLKx1 pixels wide. VBI_HDELAY is set to 0, so this should be + (64 + 0) * 2 = 128 fCLKx2 pixels. But it's not! The datasheet is + Just Plain Wrong. The real value appears to be different for + different revisions of the bt8x8 chips, and to be affected by the + horizontal scaling factor. Experimentally, the value is measured + to be about 244. */ +#define VBI_OFFSET 244 #define VBI_DEFLINES 16 #define VBI_MAXLINES 32 diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index d01b2a740..4ac9eb21a 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -1596,7 +1596,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) #endif sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); ret = class_device_register(&vfd->class_dev); - if (ret) { + if (ret < 0) { printk(KERN_ERR "%s: class_device_register failed\n", __FUNCTION__); goto fail_minor; |