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

Merge branch 'internal'

This commit is contained in:
Ralph Metzler 2018-09-17 15:31:25 +02:00
commit 21aefddd4b
2 changed files with 4 additions and 4 deletions

View File

@ -331,9 +331,9 @@ static int read_status(struct dvb_frontend *fe, enum fe_status *status)
*status = 0x00; *status = 0x00;
ddb_mci_get_info(&state->mci); ddb_mci_get_info(&state->mci);
ddb_mci_get_strength(fe); ddb_mci_get_strength(fe);
if (res.status == M4_DEMOD_WAIT_SIGNAL) if (res.status == MCI_DEMOD_WAIT_SIGNAL)
*status = 0x01; *status = 0x01;
if (res.status == M4_DEMOD_LOCKED) { if (res.status == MCI_DEMOD_LOCKED) {
*status = 0x1f; *status = 0x1f;
ddb_mci_get_snr(fe); ddb_mci_get_snr(fe);
} }

View File

@ -123,7 +123,7 @@ static int read_status(struct dvb_frontend *fe, enum fe_status *status)
ddb_mci_get_info(&state->mci); ddb_mci_get_info(&state->mci);
if (res.status == SX8_DEMOD_WAIT_MATYPE) if (res.status == SX8_DEMOD_WAIT_MATYPE)
*status = 0x0f; *status = 0x0f;
if (res.status == SX8_DEMOD_LOCKED) { if (res.status == MCI_DEMOD_LOCKED) {
*status = 0x1f; *status = 0x1f;
if (state->mci.signal_info.dvbs2_signal_info.standard == 2) { if (state->mci.signal_info.dvbs2_signal_info.standard == 2) {
sx8_base->used_ldpc_bitrate[state->mci.nr] = sx8_base->used_ldpc_bitrate[state->mci.nr] =
@ -407,7 +407,7 @@ static int set_parameters(struct dvb_frontend *fe)
if (!stat) { if (!stat) {
state->started = 1; state->started = 1;
state->first_time_lock = 1; state->first_time_lock = 1;
state->mci.signal_info.status = SX8_DEMOD_WAIT_SIGNAL; state->mci.signal_info.status = MCI_DEMOD_WAIT_SIGNAL;
} }
return stat; return stat;
} }