summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-06-28 03:17:39 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-06-28 03:17:39 +0000
commite4a3e5710f9d49095149a7ec54b295bfe177d456 (patch)
tree50af32dabd988f3bea79267013c0af6cd5552862 /linux/drivers/media/video/cx88
parent8864fa7428dae723f13f8cd22599f5b96986a843 (diff)
downloadmediapointer-dvb-s2-e4a3e5710f9d49095149a7ec54b295bfe177d456.tar.gz
mediapointer-dvb-s2-e4a3e5710f9d49095149a7ec54b295bfe177d456.tar.bz2
* cx88-i2c.c, cx88-video.c, saa7134-i2c.c, tuner-core.c, tuner.h:
- Improved support for multi tuners on multi boards. *tuner-core.c: - Pal M and PAL N added to tuner_fixup_std * tuner-simple.c: - Eliminated old tea code from tuner-simple. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88')
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c8
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c7
2 files changed, 9 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index b5342234b..1da2b872f 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
/*
- $Id: cx88-i2c.c,v 1.24 2005/06/17 18:46:23 mkrufky Exp $
+ $Id: cx88-i2c.c,v 1.25 2005/06/28 03:17:39 mchehab Exp $
cx88-i2c.c -- all the i2c code is here
@@ -100,13 +100,15 @@ static int attach_inform(struct i2c_client *client)
return 0;
if (core->radio_type != UNSET) {
- tun_addr.v4l2_tuner = V4L2_TUNER_RADIO;
+ tun_addr.v4l2_tuner = T_RADIO;
+
tun_addr.type = core->radio_type;
tun_addr.addr = core->radio_addr;
client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr);
}
if (core->tuner_type != UNSET) {
- tun_addr.v4l2_tuner = V4L2_TUNER_ANALOG_TV;
+ tun_addr.v4l2_tuner = T_ANALOG_TV;
+
tun_addr.type = core->tuner_type;
tun_addr.addr = core->tuner_addr;
client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr);
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 9b08d6469..e176d5020 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.70 2005/06/20 03:36:00 mkrufky Exp $
+ * $Id: cx88-video.c,v 1.71 2005/06/28 03:17:39 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* video4linux video interface
@@ -2095,13 +2095,14 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
if (core->tda9887_conf)
request_module("tda9887");
if (core->radio_type != UNSET) {
- tun_addr.v4l2_tuner = V4L2_TUNER_RADIO;
+ tun_addr.v4l2_tuner = T_RADIO;
tun_addr.type = core->radio_type;
tun_addr.addr = core->radio_addr;
cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr);
}
if (core->tuner_type != UNSET) {
- tun_addr.v4l2_tuner = V4L2_TUNER_ANALOG_TV;
+ tun_addr.v4l2_tuner = T_ANALOG_TV;
+
tun_addr.type = core->tuner_type;
tun_addr.addr = core->tuner_addr;
cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr);