Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164153
b: refs/heads/master
c: 90e801a
h: refs/heads/master
i:
  164151: 0bbac18
v: v3
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent 4c79cc8 commit 1d2bb6f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c64b2f78b7912bad38a73bf892fb6d0da4673c67
refs/heads/master: 90e801acb2134d905d98152a919128b9f56bbd33
24 changes: 20 additions & 4 deletions trunk/drivers/media/video/saa7164/saa7164-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ static struct tda18271_std_map hauppauge_tda18271_std_map = {
static struct tda18271_config hauppauge_hvr22x0_tuner_config = {
.std_map = &hauppauge_tda18271_std_map,
.gate = TDA18271_GATE_ANALOG,
.role = TDA18271_MASTER,
};

static struct tda18271_config hauppauge_hvr22x0s_tuner_config = {
.std_map = &hauppauge_tda18271_std_map,
.gate = TDA18271_GATE_ANALOG,
.role = TDA18271_SLAVE,
.rf_cal_on_startup = 1
};

static struct s5h1411_config hauppauge_s5h1411_config = {
Expand Down Expand Up @@ -554,10 +562,18 @@ int saa7164_dvb_register(struct saa7164_tsport *port)
&i2c_bus->i2c_adap);

if (port->dvb.frontend != NULL) {
/* TODO: addr is in the card struct */
dvb_attach(tda18271_attach, port->dvb.frontend,
0xc0 >> 1, &i2c_bus->i2c_adap,
&hauppauge_hvr22x0_tuner_config);
if (port->nr == 0) {
/* Master TDA18271 */
/* TODO: addr is in the card struct */
dvb_attach(tda18271_attach, port->dvb.frontend,
0xc0 >> 1, &i2c_bus->i2c_adap,
&hauppauge_hvr22x0_tuner_config);
} else {
/* Slave TDA18271 */
dvb_attach(tda18271_attach, port->dvb.frontend,
0xc0 >> 1, &i2c_bus->i2c_adap,
&hauppauge_hvr22x0s_tuner_config);
}
}

break;
Expand Down

0 comments on commit 1d2bb6f

Please sign in to comment.