diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-17 21:18:42 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-17 21:18:42 +0000 |
| commit | 6571d469892fabdf7854dc0e6780900640263c7a (patch) | |
| tree | 3c02433bd4c153b2e76e57fac13b99dae6739e0c /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | 1b00938af1b3c6702a96ecbf1d6770558d6b1a33 (diff) | |
| download | mediapointer-dvb-s2-6571d469892fabdf7854dc0e6780900640263c7a.tar.gz mediapointer-dvb-s2-6571d469892fabdf7854dc0e6780900640263c7a.tar.bz2 | |
- Some changes to allow compiling cx88 and saa7134 without
V4L1 support.
- This patch will help obsoleting V4L1 API.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 23ac5967e..2a7630ec5 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.97 2005/10/16 12:13:58 mchehab Exp $ + * $Id: cx88-video.c,v 1.98 2005/10/17 21:18:42 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -38,6 +38,11 @@ #include "cx88.h" +#if 1 +/* Include V4L1 specific functions. Should be removed soon */ +#include <linux/videodev.h> +#endif + MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); MODULE_LICENSE("GPL"); @@ -1444,7 +1449,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, struct v4l2_format *f = arg; return cx8800_try_fmt(dev,fh,f); } - +#ifdef HAVE_V4L1 /* --- streaming capture ------------------------------------- */ case VIDIOCGMBUF: { @@ -1470,6 +1475,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, } return 0; } +#endif case VIDIOC_REQBUFS: return videobuf_reqbufs(get_queue(fh), arg); @@ -1501,7 +1507,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, res_free(dev,fh,res); return 0; } - default: return cx88_do_ioctl( inode, file, fh->radio, core, cmd, arg, video_do_ioctl ); } @@ -1824,6 +1829,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, *id = 0; return 0; } +#ifdef HAVE_V4L1 case VIDIOCSTUNER: { struct video_tuner *v = arg; @@ -1834,6 +1840,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, cx88_call_i2c_clients(core,VIDIOCSTUNER,v); return 0; } +#endif case VIDIOC_S_TUNER: { struct v4l2_tuner *t = arg; |