1
0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00

properly support frontend input switching for MAX SX8

This commit is contained in:
Ralph Metzler 2018-05-25 00:09:50 +02:00
parent 09c068c74c
commit 875a768266
2 changed files with 5 additions and 2 deletions

View File

@ -172,7 +172,7 @@ static int probe(struct mci *state)
return 0; return 0;
} }
struct dvb_frontend *ddb_mci_attach(struct ddb_input *input, struct mci_cfg *cfg, int nr) struct dvb_frontend *ddb_mci_attach(struct ddb_input *input, struct mci_cfg *cfg, int nr, int tuner)
{ {
struct ddb_port *port = input->port; struct ddb_port *port = input->port;
struct ddb *dev = port->dev; struct ddb *dev = port->dev;
@ -212,8 +212,8 @@ struct dvb_frontend *ddb_mci_attach(struct ddb_input *input, struct mci_cfg *cfg
memcpy(&state->fe.ops, cfg->fe_ops, sizeof(struct dvb_frontend_ops)); memcpy(&state->fe.ops, cfg->fe_ops, sizeof(struct dvb_frontend_ops));
state->fe.demodulator_priv = state; state->fe.demodulator_priv = state;
state->nr = nr; state->nr = nr;
state->tuner = nr;
state->demod = nr; state->demod = nr;
state->tuner = tuner;
if (cfg->init) if (cfg->init)
cfg->init(state); cfg->init(state);
return &state->fe; return &state->fe;

View File

@ -489,6 +489,7 @@ static int sleep(struct dvb_frontend *fe)
static struct dvb_frontend_ops sx8_ops = { static struct dvb_frontend_ops sx8_ops = {
.delsys = { SYS_DVBS, SYS_DVBS2 }, .delsys = { SYS_DVBS, SYS_DVBS2 },
.xbar = { 4, 0, 8 }, /* tuner_max, demod id, demod_max */
.info = { .info = {
.name = "DVB-S/S2X", .name = "DVB-S/S2X",
.frequency_min = 950000, .frequency_min = 950000,
@ -516,6 +517,8 @@ static int init(struct mci *mci)
struct sx8 *state = (struct sx8 *) mci; struct sx8 *state = (struct sx8 *) mci;
state->mci.demod = SX8_DEMOD_NONE; state->mci.demod = SX8_DEMOD_NONE;
mci->fe.ops.xbar[1] = mci->nr;
mci->fe.dtv_property_cache.input = mci->tuner;
return 0; return 0;
} }