Merge branch 'tbsdtv_linux_media/latest' into tbsdtv_linux_media/gse

This commit is contained in:
CrazyCat
2023-11-23 20:49:33 +02:00

View File

@@ -352,6 +352,11 @@ static int stid135_set_parameters(struct dvb_frontend *fe)
err = FE_STiD135_GetLoFreqHz(state->base->handle, &(search_params.lo_frequency));
search_params.lo_frequency *= 1000000;
err |= fe_stid135_unlock(state->base->handle, state->nr + 1);
if (err != FE_LLA_NO_ERROR)
dev_err(&state->base->i2c->dev, "%s: fe_stid135_unlock error %d !\n", __func__, err);
dev_dbg(&state->base->i2c->dev, "%s: demod %d + tuner %d\n", __func__, state->nr, state->rf_in);
err |= fe_stid135_set_rfmux_path(p_params->handle_demod, state->nr + 1, state->rf_in + 1);
@@ -462,10 +467,10 @@ static int stid135_set_parameters(struct dvb_frontend *fe)
/* Set ISI after search */
if (p->stream_id != NO_STREAM_ID_FILTER) {
dev_dbg(&state->base->i2c->dev, "%s: set ISI %d !\n", __func__, p->stream_id & 0xFF);
err |= fe_stid135_select_isi(state->base->handle, state->nr + 1, p->stream_id & 0xFF);
err |= fe_stid135_set_mis_filtering(state->base->handle, state->nr + 1, TRUE, p->stream_id & 0xFF, 0xFF);
} else {
dev_dbg(&state->base->i2c->dev, "%s: disable ISI filtering !\n", __func__);
err |= fe_stid135_set_mis_filtering(state->base->handle, state->nr + 1, FALSE, 0, 0xFF);
err |= fe_stid135_set_mis_filtering(state->base->handle, state->nr + 1, FALSE, 0, 0xFF);
}
if (err != FE_LLA_NO_ERROR)
dev_err(&state->base->i2c->dev, "%s: fe_stid135_set_mis_filtering error %d !\n", __func__, err);
@@ -664,6 +669,8 @@ static int stid135_read_status(struct dvb_frontend *fe, enum fe_status *status)
//err |= fe_stid135_set_maxllr_rate(state->base->handle, state->nr +1, 90);
*status |= FE_HAS_SIGNAL;
dev_dbg(&state->base->i2c->dev, "%s: No lock, signal strength %d dBm !\n", __func__,
state->signal_info.power/1000);
p->strength.len = 2;
p->strength.stat[0].scale = FE_SCALE_DECIBEL;
@@ -688,6 +695,9 @@ static int stid135_read_status(struct dvb_frontend *fe, enum fe_status *status)
return -EIO;
}
dev_dbg(&state->base->i2c->dev, "%s: Locked, signal strength %d dBm, C/N %d dB !\n", __func__,
state->signal_info.power/1000, state->signal_info.C_N/10);
p->strength.len = 2;
p->strength.stat[0].scale = FE_SCALE_DECIBEL;
p->strength.stat[0].svalue = state->signal_info.power;