diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-27 12:20:57 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-27 12:20:57 +0000 |
| commit | 0f576583a63ad3f1044f01b88b4758c5d8e924f4 (patch) | |
| tree | 23adf364f00ec0f4687cb8acbf66689e5089804b /linux | |
| parent | ee15f10aea41bf2c35338d93dc99b251025ada59 (diff) | |
| download | mediapointer-dvb-s2-0f576583a63ad3f1044f01b88b4758c5d8e924f4.tar.gz mediapointer-dvb-s2-0f576583a63ad3f1044f01b88b4758c5d8e924f4.tar.bz2 | |
- Fixed bttv to accept radio devices like tea5767
- Enabled radio on card #137 (it's a tea5767, and it's now working)
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index b5d1350e8..7382b27a5 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.95 2005/10/16 12:34:29 mchehab Exp $ + $Id: bttv-cards.c,v 1.96 2005/10/27 12:20:57 mchehab Exp $ bttv-cards.c @@ -2743,13 +2743,11 @@ struct tvcard bttv_tvcards[] = { .audiomux = { 0, 1, 2, 2, 3 }, .needs_tvaudio = 0, .pll = PLL_28, - .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, + .tuner_type = TUNER_TENA_9533_DI, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .has_remote = 1, - #if 0 .has_radio = 1, - #endif }, /* ---- card 0x8a ---------------------------------- */ [BTTV_BOARD_PV_BT878P_2E] = { diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index c60514102..546a764c7 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.31 2005/10/26 21:27:51 mchehab Exp $ + $Id: bttv-i2c.c,v 1.32 2005/10/27 12:20:58 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -315,21 +315,22 @@ static int attach_inform(struct i2c_client *client) if (btv->tuner_type != UNSET) { struct tuner_setup tun_setup; + struct tuner *t = i2c_get_clientdata(client); if ((addr==ADDR_UNSET)||(addr==client->addr)) { tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV; tun_setup.type = btv->tuner_type; tun_setup.addr = ADDR_UNSET; - client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); } - if ((radio_addr==ADDR_UNSET)||(radio_addr==client->addr)) { + + if (t->type != UNSET && t->mode_mask == T_RADIO) { + tun_setup.type = t->type; tun_setup.mode_mask = T_RADIO; - tun_setup.type = btv->tuner_type; tun_setup.addr = ADDR_UNSET; - - client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); } + + client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); } if (btv->pinnacle_id != UNSET) |