frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

handle gate control errors

Browse Source
This commit is contained in:
Ralph Metzler 2017-10-02 00:54:53 +02:00
parent b5ae7ac76f
commit 83000cd73a
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontends/stv0910.c
View File

@ -1196,24 +1196,21 @@ static int gate_ctrl(struct dvb_frontend *fe, int enable)
{ {
struct stv *state = fe->demodulator_priv; struct stv *state = fe->demodulator_priv;
u8 i2crpt = state->i2crpt & ~0x86; u8 i2crpt = state->i2crpt & ~0x86;
int stat;
if (enable) if (enable) {
mutex_lock(&state->base->i2c_lock); mutex_lock(&state->base->i2c_lock);
if (enable)
i2crpt |= 0x80; i2crpt |= 0x80;
else } else
i2crpt |= 0x02; i2crpt |= 0x02;
if (write_reg(state, state->nr ? RSTV0910_P2_I2CRPT : stat = write_reg(state, state->nr ? RSTV0910_P2_I2CRPT :
RSTV0910_P1_I2CRPT, i2crpt) < 0) RSTV0910_P1_I2CRPT, i2crpt);
return -EIO;
state->i2crpt = i2crpt; state->i2crpt = i2crpt;
if (!enable) if (!enable)
mutex_unlock(&state->base->i2c_lock); mutex_unlock(&state->base->i2c_lock);
return 0; return stat;
} }
static void release(struct dvb_frontend *fe) static void release(struct dvb_frontend *fe)

39
frontends/stv6111.c
View File

@ -213,6 +213,7 @@ static int set_bandwidth(struct dvb_frontend *fe, u32 CutOffFrequency)
{ {
struct stv *state = fe->tuner_priv; struct stv *state = fe->tuner_priv;
u32 index = (CutOffFrequency + 999999) / 1000000; u32 index = (CutOffFrequency + 999999) / 1000000;
int stat = 0;
if (index < 6) if (index < 6)
index = 6; index = 6;
@ -224,12 +225,14 @@ static int set_bandwidth(struct dvb_frontend *fe, u32 CutOffFrequency)
state->reg[0x08] = (state->reg[0x08] & ~0xFC) | ((index-6) << 2); state->reg[0x08] = (state->reg[0x08] & ~0xFC) | ((index-6) << 2);
state->reg[0x09] = (state->reg[0x09] & ~0x0C) | 0x08; state->reg[0x09] = (state->reg[0x09] & ~0x0C) | 0x08;
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); stat = fe->ops.i2c_gate_ctrl(fe, 1);
write_regs(state, 0x08, 2); if (!stat) {
wait_for_call_done(state, 0x08); write_regs(state, 0x08, 2);
wait_for_call_done(state, 0x08);
}
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
return 0; return stat;
} }
static int set_lof(struct stv *state, u32 LocalFrequency, u32 CutOffFrequency) static int set_lof(struct stv *state, u32 LocalFrequency, u32 CutOffFrequency)
@ -311,6 +314,7 @@ static int set_params(struct dvb_frontend *fe)
struct stv *state = fe->tuner_priv; struct stv *state = fe->tuner_priv;
struct dtv_frontend_properties *p = &fe->dtv_property_cache; struct dtv_frontend_properties *p = &fe->dtv_property_cache;
u32 freq, symb, cutoff; u32 freq, symb, cutoff;
int stat = 0;
if (p->delivery_system != SYS_DVBS && p->delivery_system != SYS_DVBS2) if (p->delivery_system != SYS_DVBS && p->delivery_system != SYS_DVBS2)
return -EINVAL; return -EINVAL;
@ -320,11 +324,12 @@ static int set_params(struct dvb_frontend *fe)
cutoff = 5000000 + MulDiv32(p->symbol_rate, 135, 200); cutoff = 5000000 + MulDiv32(p->symbol_rate, 135, 200);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); stat = fe->ops.i2c_gate_ctrl(fe, 1);
set_lof(state, freq, cutoff); if (!stat)
set_lof(state, freq, cutoff);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
return 0; return stat;
} }
static int get_frequency(struct dvb_frontend *fe, u32 *frequency) static int get_frequency(struct dvb_frontend *fe, u32 *frequency)
@ -630,13 +635,16 @@ static int get_rf_strength(struct dvb_frontend *fe, u16 *st)
// RF Mode // RF Mode
// Read AGC ADC // Read AGC ADC
u8 Reg = 0; u8 Reg = 0;
int stat = 0;
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); stat = fe->ops.i2c_gate_ctrl(fe, 1);
write_reg(state, 0x02, state->reg[0x02] | 0x20); if (!stat) {
read_reg(state, 2, &Reg); write_reg(state, 0x02, state->reg[0x02] | 0x20);
if( Reg & 0x20 )
read_reg(state, 2, &Reg); read_reg(state, 2, &Reg);
if (Reg & 0x20)
read_reg(state, 2, &Reg);
}
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
@ -714,7 +722,7 @@ struct dvb_frontend *stv6111_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 adr) struct i2c_adapter *i2c, u8 adr)
{ {
struct stv *state; struct stv *state;
int stat; int stat = 0;
state = kzalloc(sizeof(struct stv), GFP_KERNEL); state = kzalloc(sizeof(struct stv), GFP_KERNEL);
if (!state) if (!state)
@ -725,13 +733,14 @@ struct dvb_frontend *stv6111_attach(struct dvb_frontend *fe,
init_state(state); init_state(state);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); stat = fe->ops.i2c_gate_ctrl(fe, 1);
stat = attach_init(state); if (!stat)
stat = attach_init(state);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
if (stat < 0) { if (stat < 0) {
kfree(state); kfree(state);
return 0; return NULL;
} }
fe->tuner_priv = state; fe->tuner_priv = state;
return fe; return fe;