diff options
| author | Patrick Boettcher <devnull@localhost> | 2004-12-02 18:02:29 +0000 |
|---|---|---|
| committer | Patrick Boettcher <devnull@localhost> | 2004-12-02 18:02:29 +0000 |
| commit | 3798b42fad1ba009d1dd41652e88c4e488b15bf1 (patch) | |
| tree | 23a34dc0574c5834aa409e99f036482a3e3e5956 /linux/drivers/media/dvb/frontends/dib3000mc.c | |
| parent | 7e603b49663feb3eb48364641562489c3373b1b0 (diff) | |
| download | mediapointer-dvb-s2-3798b42fad1ba009d1dd41652e88c4e488b15bf1.tar.gz mediapointer-dvb-s2-3798b42fad1ba009d1dd41652e88c4e488b15bf1.tar.bz2 | |
- prepared support for dynamically i2c addresses of the demod
- added license information for the dib3000-common module
Diffstat (limited to 'linux/drivers/media/dvb/frontends/dib3000mc.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/dib3000mc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/dib3000mc.c b/linux/drivers/media/dvb/frontends/dib3000mc.c index 2a9de89aa..d395afb73 100644 --- a/linux/drivers/media/dvb/frontends/dib3000mc.c +++ b/linux/drivers/media/dvb/frontends/dib3000mc.c @@ -200,10 +200,10 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe, if (tuner) { wr(DIB3000MC_REG_TUNER, - DIB3000_TUNER_WRITE_ENABLE(state->config->pll_addr)); - state->config->pll_set(fe, fep); + DIB3000_TUNER_WRITE_ENABLE(state->config.pll_addr)); + state->config.pll_set(fe, fep); wr(DIB3000MC_REG_TUNER, - DIB3000_TUNER_WRITE_DISABLE(state->config->pll_addr)); + DIB3000_TUNER_WRITE_DISABLE(state->config.pll_addr)); } dib3000mc_set_timing(state,0,ofdm->transmission_mode,ofdm->bandwidth); @@ -370,11 +370,11 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode) wr(DIB3000MC_REG_ELEC_OUT,DIB3000MC_ELEC_OUT_DIV_OUT_ON); wr(DIB3000MC_REG_OUTMODE,DIB3000MC_OM_PAR_CONT_CLK); wr(DIB3000MC_REG_RST_I2C_ADDR, - DIB3000MC_DEMOD_ADDR(state->config->demod_address) | + DIB3000MC_DEMOD_ADDR(state->config.demod_address) | DIB3000MC_DEMOD_ADDR_ON); wr(DIB3000MC_REG_RST_I2C_ADDR, - DIB3000MC_DEMOD_ADDR(state->config->demod_address)); + DIB3000MC_DEMOD_ADDR(state->config.demod_address)); wr(DIB3000MC_REG_RESTART,DIB3000MC_RESTART_CONFIG); wr(DIB3000MC_REG_RESTART,DIB3000MC_RESTART_OFF); @@ -778,8 +778,8 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config, goto error; /* setup the state */ - state->config = config; state->i2c = i2c; + memcpy(&state->config,config,sizeof(struct dib3000_config)); memcpy(&state->ops, &dib3000mc_ops, sizeof(struct dvb_frontend_ops)); /* check for the correct demod */ |