summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-06-15 02:43:03 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-06-15 02:43:03 +0000
commit9ca80dc4f0206c43b06abe9a42637b5e634874f5 (patch)
treeba69f6cb6f081879e03fe48af2b621026df2f953 /linux/drivers/media/video/cx88/cx88-video.c
parent91d384425a9324c328c5f2c3e648d40ddfc76c19 (diff)
downloadmediapointer-dvb-s2-9ca80dc4f0206c43b06abe9a42637b5e634874f5.tar.gz
mediapointer-dvb-s2-9ca80dc4f0206c43b06abe9a42637b5e634874f5.tar.bz2
I2C API has changed on 2.6.12-rc6-mm1: I2C_CLIENT_INSMOD macro now doesn't
require nor uses normal_i2c_range. A new define (CONFIG_USE_I2C_RANGE) is provided to provide compatibility. It is meant to be replaced by a kernel version test after aplyed to mainstream. This patch corrects it. High precision tunning on Radio is correclty supported. Some radio apps already uses it. There's an auto-detection process to check tuner range. Detailed info: * Make.config, Makefile, tuner-core.c: - CONFIG_TUNER_MULTI_I2C dropped from tuner-core.c and included on Make.config - included CONFIG_USE_I2C_RANGE for kernels that requires normal_i2c_range struct (only kernels after 2.6.12-rc6-mm1 doesn't require). * bt832.c, msp3400.c, saa6752hs.c, tda7432.c, tda9875.c, tda9887.c, tuner-core.c,tvaudio.c, tveeprom.c, - I2C range detection corrected to new behavior of 2.6.12-rc6-mm1 * cx88-video.c, tea5767, tuner-core.c: - V4L2_TUNER_CAP_LOW implemented according with V4L2 API for Radio. - tea5767 debug improved. * .bp/2.6/v4l-driver-doc - typo corrected. 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.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 7c0fcd89b..5614147f3 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.63 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: cx88-video.c,v 1.64 2005/06/15 02:43:03 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* video4linux video interface
@@ -1358,9 +1358,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
V4L2_CAP_STREAMING |
V4L2_CAP_VBI_CAPTURE |
#if 0
- V4L2_TUNER_CAP_LOW |
-#endif
-#if 0
V4L2_CAP_VIDEO_OVERLAY |
#endif
0;
@@ -1721,11 +1718,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
sizeof(cap->card));
sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
cap->version = CX88_VERSION_CODE;
- cap->capabilities = V4L2_CAP_TUNER
-#if 0
- | V4L2_TUNER_CAP_LOW
-#endif
- ;
+ cap->capabilities = V4L2_CAP_TUNER;
return 0;
}
case VIDIOC_G_TUNER:
@@ -1737,8 +1730,10 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
memset(t,0,sizeof(*t));
strcpy(t->name, "Radio");
+#if 0
t->rangelow = (int)(65*16);
t->rangehigh = (int)(108*16);
+#endif
#ifdef V4L2_I2C_CLIENTS
cx88_call_i2c_clients(dev->core,VIDIOC_G_TUNER,t);