diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-03 20:21:15 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-03 20:21:15 +0000 |
| commit | 34d4ff69451a3664a5e6ca3198499181c8600f72 (patch) | |
| tree | cb963993dde8973acd3a38fb2f2c33e669cdbc24 /linux/drivers | |
| parent | 68c88c106593cfdc90be2ca94db91cc51685c6ee (diff) | |
| download | mediapointer-dvb-s2-34d4ff69451a3664a5e6ca3198499181c8600f72.tar.gz mediapointer-dvb-s2-34d4ff69451a3664a5e6ca3198499181c8600f72.tar.bz2 | |
* bttv-cards.c, bttv-driver.c:
- no_overlay now behaves as described on docs.
* doc/insmod-options:
- no_overlay flag description updated.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 85138fb8b..f81c10e0a 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.63 2005/08/03 03:23:41 mchehab Exp $ + $Id: bttv-cards.c,v 1.64 2005/08/03 20:21:15 mchehab Exp $ bttv-cards.c @@ -98,7 +98,7 @@ static int __devinit pvr_boot(struct bttv *btv); static unsigned int triton1=0; static unsigned int vsfx=0; static unsigned int latency = UNSET; -unsigned int no_overlay=0; +unsigned int no_overlay=-1; static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; @@ -4592,6 +4592,8 @@ void __devinit bttv_check_chipset(void) if (!no_overlay) { printk(KERN_WARNING "bttv: going to disable overlay.\n"); no_overlay = 1; + } else { + printk(KERN_WARNING "bttv: overlay forced. You may suffer some OOPS.\n"); } } if (UNSET != latency) diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 7e7f75e79..a91c59148 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.49 2005/08/03 19:42:24 mchehab Exp $ + $Id: bttv-driver.c,v 1.50 2005/08/03 20:21:15 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -2171,8 +2171,8 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv, return 0; } case V4L2_BUF_TYPE_VIDEO_OVERLAY: - if (no_overlay) { - printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay=1\n"); + if (no_overlay > 0) { + printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay\n"); return -EINVAL; } return setup_window(fh, btv, &f->fmt.win, 1); @@ -2250,7 +2250,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, VID_TYPE_TUNER| VID_TYPE_CLIPPING| VID_TYPE_SCALES; - if (!no_overlay) + if (no_overlay <= 0) cap->type |= VID_TYPE_OVERLAY; cap->maxwidth = bttv_tvnorms[btv->tvnorm].swidth; @@ -2328,8 +2328,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, struct video_window *win = arg; struct v4l2_window w2; - if (no_overlay) { - printk ("VIDIOCSWIN: no_overlay=1\n"); + if (no_overlay > 0) { + printk ("VIDIOCSWIN: no_overlay\n"); return -EINVAL; } @@ -2611,7 +2611,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, V4L2_CAP_VBI_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; - if (!no_overlay) + if (no_overlay <= 0) cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY; if (bttv_tvcards[btv->c.type].tuner != UNSET && @@ -3793,7 +3793,7 @@ static void bttv_unregister_video(struct bttv *btv) /* register video4linux devices */ static int __devinit bttv_register_video(struct bttv *btv) { - if (!no_overlay) + if (no_overlay <= 0) bttv_video_template.type |= VID_TYPE_OVERLAY; /* video */ |