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:
none 2021-03-09 22:05:45 +01:00
commit 8f4cd19539
2 changed files with 14 additions and 5 deletions

View File

@ -40,6 +40,10 @@ static int old_quattro;
module_param(old_quattro, int, 0444); module_param(old_quattro, int, 0444);
MODULE_PARM_DESC(old_quattro, "old quattro LNB input order "); MODULE_PARM_DESC(old_quattro, "old quattro LNB input order ");
static int no_voltage;
module_param(no_voltage, int, 0444);
MODULE_PARM_DESC(no_voltage, "Do not enable voltage on LNBH (will also disable 22KHz tone).");
/* MAX LNB interface related functions */ /* MAX LNB interface related functions */
static int lnb_command(struct ddb *dev, u32 link, u32 lnb, u32 cmd) static int lnb_command(struct ddb *dev, u32 link, u32 lnb, u32 cmd)
@ -164,6 +168,8 @@ static int lnb_set_voltage(struct ddb *dev, u32 link, u32 input,
{ {
int s = 0; int s = 0;
if (no_voltage)
voltage = SEC_VOLTAGE_OFF;
if (dev->link[link].lnb.oldvoltage[input] == voltage) if (dev->link[link].lnb.oldvoltage[input] == voltage)
return 0; return 0;
switch (voltage) { switch (voltage) {

View File

@ -147,11 +147,14 @@ static int read_status(struct dvb_frontend *fe, enum fe_status *status)
if (res.status == MCI_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] = mutex_lock(&mci_base->tuner_lock);
p->symbol_rate * if (state->started)
dvbs2_bits_per_symbol[ sx8_base->used_ldpc_bitrate[state->mci.nr] =
state->mci.signal_info. p->symbol_rate *
dvbs2_signal_info.pls_code]; dvbs2_bits_per_symbol[
state->mci.signal_info.
dvbs2_signal_info.pls_code];
mutex_unlock(&mci_base->tuner_lock);
} else } else
sx8_base->used_ldpc_bitrate[state->mci.nr] = 0; sx8_base->used_ldpc_bitrate[state->mci.nr] = 0;
} }