X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9a632d21c0c849f2e08d388df916e055fbaf42ca..c746e07fe32dd9cd95c5bddba437d9f2daf69fcf:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 8754e773..79c9ad0b 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -125,6 +125,7 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto if ( fec != FEC::fNone && fec > FEC::f9_10 ) fec = FEC::fAuto; inversion = Inversion::Unknown; + pilot = Pilot::Unknown; orbital_position = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000; orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100; orbital_position += ((descriptor.getOrbitalPosition() >> 4) & 0xF) * 10; @@ -138,16 +139,16 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK"); modulation=QPSK; } - roll_off = descriptor.getRollOff(); + rolloff = descriptor.getRollOff(); if (system == System::DVB_S2) { - eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, roll_off %d", + eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, rolloff %d", frequency, polarisation ? "hor" : "vert", orbital_position, symbol_rate, fec, modulation, - roll_off); + rolloff); } else { @@ -419,7 +420,8 @@ int eDVBFrontend::PriorityOrder=0; eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) :m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe) - ,m_fd(-1), m_need_rotor_workaround(false), m_sn(0), m_timeout(0), m_tuneTimer(0) + ,m_fd(-1), m_need_rotor_workaround(false), m_can_handle_dvbs2(false) + ,m_sn(0), m_timeout(0), m_tuneTimer(0) #if HAVE_DVB_API_VERSION < 3 ,m_secfd(-1) #endif @@ -450,7 +452,7 @@ int eDVBFrontend::openFrontend() if (m_sn) return -1; // already opened - m_state=0; + m_state=stateIdle; m_tuning=0; #if HAVE_DVB_API_VERSION < 3 @@ -522,24 +524,28 @@ int eDVBFrontend::openFrontend() setTone(iDVBFrontend::toneOff); setVoltage(iDVBFrontend::voltageOff); - m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read); + m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read, false); CONNECT(m_sn->activated, eDVBFrontend::feEvent); return 0; } -int eDVBFrontend::closeFrontend() +int eDVBFrontend::closeFrontend(bool force) { - eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_NEXT_PTR]; - while (linked_fe != (eDVBRegisteredFrontend*)-1) + if (!force && m_data[CUR_VOLTAGE] != -1 && m_data[CUR_VOLTAGE] != iDVBFrontend::voltageOff) { - if (linked_fe->m_inuse) + long tmp = m_data[LINKED_NEXT_PTR]; + while (tmp != -1) { - eDebug("dont close frontend %d until the linked frontend %d in slot %d is still in use", - m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID()); - return -1; + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp; + if (linked_fe->m_inuse) + { + eDebug("dont close frontend %d until the linked frontend %d in slot %d is still in use", + m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID()); + return -1; + } + linked_fe->m_frontend->getData(LINKED_NEXT_PTR, tmp); } - linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (long&)linked_fe); } if (m_fd >= 0) { @@ -553,7 +559,6 @@ int eDVBFrontend::closeFrontend() m_fd=-1; else eWarning("couldnt close frontend %d", m_dvbid); - m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; } #if HAVE_DVB_API_VERSION < 3 if (m_secfd >= 0) @@ -566,12 +571,14 @@ int eDVBFrontend::closeFrontend() #endif delete m_sn; m_sn=0; + m_state = stateClosed; return 0; } eDVBFrontend::~eDVBFrontend() { + m_data[LINKED_PREV_PTR] = m_data[LINKED_NEXT_PTR] = -1; closeFrontend(); delete m_timeout; delete m_tuneTimer; @@ -616,9 +623,19 @@ void eDVBFrontend::feEvent(int w) state = stateTuning; else { + eDVBFrontend *sec_fe = this; + long tmp = m_data[LINKED_PREV_PTR]; + eDebug("stateLostLock"); state = stateLostLock; - m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc + + while (tmp != -1) + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp; + sec_fe = linked_fe->m_frontend; + sec_fe->getData(LINKED_NEXT_PTR, tmp); + } + sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc } } if (m_state != state) @@ -639,6 +656,8 @@ void eDVBFrontend::timeout() } } +#define INRANGE(X,Y,Z) (((X<=Y) && (Y<=Z))||((Z<=Y) && (Y<=X)) ? 1 : 0) + int eDVBFrontend::readFrontendData(int type) { switch(type) @@ -695,6 +714,49 @@ int eDVBFrontend::readFrontendData(int type) return (int)(snr_in_db * 100.0); } + else if (strstr(m_description, "Alps BSBE1 C01A") || + !strcmp(m_description, "Alps -S(STV0288)")) + { + if (snr == 0) + return 0; + else if (snr == 0xFFFF) // i think this should not happen + return 100*100; + else + { + enum { REALVAL, REGVAL }; + const long CN_lookup[31][2] = { + {20,8900}, {25,8680}, {30,8420}, {35,8217}, {40,7897}, + {50,7333}, {60,6747}, {70,6162}, {80,5580}, {90,5029}, + {100,4529}, {110,4080}, {120,3685}, {130,3316}, {140,2982}, + {150,2688}, {160,2418}, {170,2188}, {180,1982}, {190,1802}, + {200,1663}, {210,1520}, {220,1400}, {230,1295}, {240,1201}, + {250,1123}, {260,1058}, {270,1004}, {280,957}, {290,920}, + {300,890} + }; + long regval = 0xFFFF - ((snr / 3) + 0xA100), // revert some dvb api calulations to get the real register value + Imin=0, + Imax=30, + i; + if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[Imax][REGVAL])) + { + long val; + while((Imax-Imin)>1) + { + i=(Imax+Imin)/2; + if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[i][REGVAL])) + Imax = i; + else + Imin = i; + } + return (((regval - CN_lookup[Imin][REGVAL]) + * (CN_lookup[Imax][REALVAL] - CN_lookup[Imin][REALVAL]) + / (CN_lookup[Imax][REGVAL] - CN_lookup[Imin][REGVAL])) + + CN_lookup[Imin][REALVAL]) * 10; + } + return 100; + } + return 0; + } else if (!strcmp(m_description, "Alps BSBE1 702A") || // some frontends with STV0299 !strcmp(m_description, "Alps -S") || !strcmp(m_description, "Philips -S") || @@ -785,9 +847,7 @@ void PutToDict(ePyObject &dict, const char*key, const char *value) void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe) { long freq_offset=0; - long csw=0; const char *tmp=0; - fe->getData(eDVBFrontend::CSW, csw); fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset); int frequency = parm_frequency + freq_offset; PutToDict(dict, "frequency", frequency); @@ -854,22 +914,61 @@ void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, e break; #endif } + PutToDict(dict, "fec_inner", tmp); #if HAVE_DVB_API_VERSION >=3 PutToDict(dict, "modulation", parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" ); + if (parm_u_qpsk_fec_inner > FEC_AUTO) + { + switch(parm_inversion & 0xc) + { + default: // unknown rolloff + case 0: // 0.35 + tmp = "ROLLOFF_0_35"; + break; + case 4: // 0.25 + tmp = "ROLLOFF_0_25"; + break; + case 8: // 0.20 + tmp = "ROLLOFF_0_20"; + break; + } + PutToDict(dict, "rolloff", tmp); + if (parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10) + { + switch(parm_inversion & 0x30) + { + case 0: // pilot off + tmp = "PILOT_OFF"; + break; + case 0x10: // pilot on + tmp = "PILOT_ON"; + break; + case 0x20: // pilot auto + tmp = "PILOT_AUTO"; + break; + } + PutToDict(dict, "pilot", tmp); + } + tmp = "DVB-S2"; + } + else + tmp = "DVB-S"; #else PutToDict(dict, "modulation", "QPSK" ); + tmp = "DVB-S"; #endif - PutToDict(dict, "fec_inner", tmp); - tmp = parm_u_qpsk_fec_inner > FEC_AUTO ? - "DVB-S2" : "DVB-S"; PutToDict(dict, "system", tmp); } void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm) { const char *tmp=0; +#if HAVE_DVB_API_VERSION < 3 + PutToDict(dict, "frequency", parm_frequency); +#else PutToDict(dict, "frequency", parm_frequency/1000); +#endif PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate); switch(parm_u_qam_fec_inner) { @@ -1166,7 +1265,7 @@ void eDVBFrontend::getFrontendData(ePyObject dest) if (dest && PyDict_Check(dest)) { const char *tmp=0; - PutToDict(dest, "tuner_number", m_dvbid); + PutToDict(dest, "tuner_number", m_slotid); switch(m_type) { case feSatellite: @@ -1197,7 +1296,7 @@ int eDVBFrontend::readInputpower() FILE *f=fopen(proc_name, "r"); if (f) { - if (fscanf(f, "%08x", &power) != 1) + if (fscanf(f, "%d", &power) != 1) eDebug("read %s failed!! (%m)", proc_name); else eDebug("%s is %d\n", proc_name, power); @@ -1244,40 +1343,35 @@ bool eDVBFrontend::setSecSequencePos(int steps) return true; } -void eDVBFrontend::setRotorData(int pos, int cmd) +void eDVBFrontend::tuneLoop() // called by m_tuneTimer { - m_data[ROTOR_CMD] = cmd; - m_data[ROTOR_POS] = pos; - if ( m_data[SATPOS_DEPENDS_PTR] != -1 ) - { - eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) m_data[SATPOS_DEPENDS_PTR]; - satpos_depends_to_fe->m_frontend->m_data[ROTOR_CMD] = cmd; - satpos_depends_to_fe->m_frontend->m_data[ROTOR_POS] = pos; - } - else - { - eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR]; - while ( (long)next != -1 ) - { - next->m_frontend->m_data[ROTOR_CMD] = cmd; - next->m_frontend->m_data[ROTOR_POS] = pos; - next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[LINKED_NEXT_PTR]; - } - eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)m_data[LINKED_PREV_PTR]; - while ( (long)prev != -1 ) - { - prev->m_frontend->m_data[ROTOR_CMD] = cmd; - prev->m_frontend->m_data[ROTOR_POS] = pos; - prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[LINKED_PREV_PTR]; + int delay=0; + eDVBFrontend *sec_fe = this; + eDVBRegisteredFrontend *regFE = 0; + long tmp = m_data[LINKED_PREV_PTR]; + while ( tmp != -1 ) + { + eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)tmp; + sec_fe = prev->m_frontend; + tmp = prev->m_frontend->m_data[LINKED_PREV_PTR]; + if (tmp == -1 && sec_fe != this && !prev->m_inuse) { + int state = sec_fe->m_state; + if (state != eDVBFrontend::stateIdle && state != stateClosed) + { + sec_fe->closeFrontend(true); + state = sec_fe->m_state; + } + if (state == eDVBFrontend::stateClosed) + { + regFE = prev; + prev->inc_use(); + } } } -} -void eDVBFrontend::tuneLoop() // called by m_tuneTimer -{ - int delay=0; if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() ) { + long *sec_fe_data = sec_fe->m_data; // eDebug("tuneLoop %d\n", m_sec_sequence.current()->cmd); switch (m_sec_sequence.current()->cmd) { @@ -1293,13 +1387,13 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer { int voltage = m_sec_sequence.current()++->voltage; eDebug("[SEC] setVoltage %d", voltage); - setVoltage(voltage); + sec_fe->setVoltage(voltage); break; } case eSecCommand::IF_VOLTAGE_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.voltage == m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) + if ( compare.voltage == sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; @@ -1307,7 +1401,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_NOT_VOLTAGE_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.voltage != m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) + if ( compare.voltage != sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; @@ -1315,7 +1409,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_TONE_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.tone == m_data[CUR_TONE] && setSecSequencePos(compare.steps) ) + if ( compare.tone == sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; @@ -1323,17 +1417,17 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_NOT_TONE_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.tone != m_data[CUR_TONE] && setSecSequencePos(compare.steps) ) + if ( compare.tone != sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; } case eSecCommand::SET_TONE: eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone); - setTone(m_sec_sequence.current()++->tone); + sec_fe->setTone(m_sec_sequence.current()++->tone); break; case eSecCommand::SEND_DISEQC: - sendDiseqc(m_sec_sequence.current()->diseqc); + sec_fe->sendDiseqc(m_sec_sequence.current()->diseqc); eDebugNoNewLine("[SEC] sendDiseqc: "); for (int i=0; i < m_sec_sequence.current()->diseqc.len; ++i) eDebugNoNewLine("%02x", m_sec_sequence.current()->diseqc.data[i]); @@ -1342,7 +1436,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; case eSecCommand::SEND_TONEBURST: eDebug("[SEC] sendToneburst: %d", m_sec_sequence.current()->toneburst); - sendToneburst(m_sec_sequence.current()++->toneburst); + sec_fe->sendToneburst(m_sec_sequence.current()++->toneburst); break; case eSecCommand::SET_FRONTEND: eDebug("[SEC] setFrontend"); @@ -1374,7 +1468,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer int idx = m_sec_sequence.current()++->val; if ( idx == 0 || idx == 1 ) { - m_idleInputpower[idx] = readInputpower(); + m_idleInputpower[idx] = sec_fe->readInputpower(); eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]); } else @@ -1387,7 +1481,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer int idx = compare.val; if ( idx == 0 || idx == 1 ) { - int idle = readInputpower(); + int idle = sec_fe->readInputpower(); int diff = abs(idle-m_idleInputpower[idx]); if ( diff > 0) { @@ -1425,13 +1519,13 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; } case eSecCommand::MEASURE_RUNNING_INPUTPOWER: - m_runningInputpower = readInputpower(); + m_runningInputpower = sec_fe->readInputpower(); eDebug("[SEC] runningInputpower is %d", m_runningInputpower); ++m_sec_sequence.current(); break; case eSecCommand::IF_INPUTPOWER_DELTA_GOTO: { - int idleInputpower = m_idleInputpower[ (m_data[CUR_VOLTAGE]&1) ? 0 : 1]; + int idleInputpower = m_idleInputpower[ (sec_fe_data[CUR_VOLTAGE]&1) ? 0 : 1]; eSecCommand::rotor &cmd = m_sec_sequence.current()->measure; const char *txt = cmd.direction ? "running" : "stopped"; eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d", @@ -1464,19 +1558,35 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; } case eSecCommand::IF_ROTORPOS_VALID_GOTO: - if (m_data[ROTOR_CMD] != -1 && m_data[ROTOR_POS] != -1) + if (sec_fe_data[ROTOR_CMD] != -1 && sec_fe_data[ROTOR_POS] != -1) setSecSequencePos(m_sec_sequence.current()->steps); else ++m_sec_sequence.current(); break; + case eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS: + eDebug("[SEC] invalidate current switch params"); + sec_fe_data[CSW] = -1; + sec_fe_data[UCSW] = -1; + sec_fe_data[TONEBURST] = -1; + ++m_sec_sequence.current(); + break; + case eSecCommand::UPDATE_CURRENT_SWITCHPARMS: + sec_fe_data[CSW] = sec_fe_data[NEW_CSW]; + sec_fe_data[UCSW] = sec_fe_data[NEW_UCSW]; + sec_fe_data[TONEBURST] = sec_fe_data[NEW_TONEBURST]; + eDebug("[SEC] update current switch params"); + ++m_sec_sequence.current(); + break; case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS: eDebug("[SEC] invalidate current rotorparams"); - setRotorData(-1,-1); + sec_fe_data[ROTOR_CMD] = -1; + sec_fe_data[ROTOR_POS] = -1; ++m_sec_sequence.current(); break; case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: - setRotorData(m_data[NEW_ROTOR_POS], m_data[NEW_ROTOR_CMD]); - eDebug("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]); + sec_fe_data[ROTOR_CMD] = sec_fe_data[NEW_ROTOR_CMD]; + sec_fe_data[ROTOR_POS] = sec_fe_data[NEW_ROTOR_POS]; + eDebug("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, sec_fe_data[ROTOR_CMD], sec_fe_data[ROTOR_POS]); ++m_sec_sequence.current(); break; case eSecCommand::SET_ROTOR_DISEQC_RETRYS: @@ -1494,16 +1604,28 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; case eSecCommand::SET_POWER_LIMITING_MODE: { - if (m_need_rotor_workaround) + char proc_name[64]; + sprintf(proc_name, "/proc/stb/frontend/%d/static_current_limiting", sec_fe->m_dvbid); + FILE *f=fopen(proc_name, "w"); + if (f) // new interface exist? + { + bool slimiting = m_sec_sequence.current()->mode == eSecCommand::modeStatic; + if (fprintf(f, "%s", slimiting ? "on" : "off") <= 0) + eDebug("write %s failed!! (%m)", proc_name); + else + eDebug("[SEC] set %s current limiting", slimiting ? "static" : "dynamic"); + fclose(f); + } + else if (sec_fe->m_need_rotor_workaround) { char dev[16]; - + int slotid = sec_fe->m_slotid; // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000 - if (m_slotid < 2) - sprintf(dev, "/dev/i2c/%d", m_slotid); - else if (m_slotid == 2) + if (slotid < 2) + sprintf(dev, "/dev/i2c/%d", slotid); + else if (slotid == 2) sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2 - else if (m_slotid == 3) + else if (slotid == 3) sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4 int fd = ::open(dev, O_RDWR); @@ -1535,6 +1657,8 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer } m_tuneTimer->start(delay,true); } + if (regFE) + regFE->dec_use(); } void eDVBFrontend::setFrontend() @@ -1653,9 +1777,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm, eDebug("no valid fec for DVB-S2 set.. abort !!"); return -EINVAL; } - if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK) + parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff + if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK) { parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9); // 8PSK fec driver values are decimal 9 bigger + parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot + } } #endif // FIXME !!! get frequency range from tuner @@ -1671,7 +1798,11 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm, RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm) { +#if HAVE_DVB_API_VERSION < 3 + parm_frequency = feparm.frequency; +#else parm_frequency = feparm.frequency * 1000; +#endif parm_u_qam_symbol_rate = feparm.symbol_rate; switch (feparm.modulation) { @@ -2020,8 +2151,7 @@ RESULT eDVBFrontend::setVoltage(int voltage) switch (voltage) { case voltageOff: - for (int i=0; i < 3; ++i) // reset diseqc - m_data[i]=-1; + m_data[CSW]=m_data[UCSW]=m_data[TONEBURST]=-1; // reset diseqc vlt = SEC_VOLTAGE_OFF; break; case voltage13_5: @@ -2176,18 +2306,24 @@ int eDVBFrontend::isCompatibleWith(ePtr &feparm) int type; if (feparm->getSystem(type) || type != m_type || !m_enabled) return 0; - if (m_type == eDVBFrontend::feSatellite) { ASSERT(m_sec); eDVBFrontendParametersSatellite sat_parm; int ret = feparm->getDVBS(sat_parm); ASSERT(!ret); - return m_sec->canTune(sat_parm, this, 1 << m_slotid); + if (sat_parm.system == eDVBFrontendParametersSatellite::System::DVB_S2 && !m_can_handle_dvbs2) + return 0; + ret = m_sec->canTune(sat_parm, this, 1 << m_slotid); + if (ret > 1 && sat_parm.system == eDVBFrontendParametersSatellite::System::DVB_S && m_can_handle_dvbs2) + ret -= 1; + return ret; } else if (m_type == eDVBFrontend::feCable) return 2; // more prio for cable frontends - return 1; + else if (m_type == eDVBFrontend::feTerrestrial) + return 1; + return 0; } bool eDVBFrontend::setSlotInfo(ePyObject obj) @@ -2206,9 +2342,11 @@ bool eDVBFrontend::setSlotInfo(ePyObject obj) // HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator... m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") || !!strstr(m_description, "Alps BSBE2") || - !!strstr(m_description, "Alps -S"); - eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s", - m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No" ); + !!strstr(m_description, "Alps -S") || + !!strstr(m_description, "BCM4501"); + m_can_handle_dvbs2 = !!strstr(m_description, "Alps BSBE2") || !!strstr(m_description, "BCM4501"); + eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s, DVB-S2 %s", + m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No", m_can_handle_dvbs2 ? "Yes" : "No" ); return true; arg_error: PyErr_SetString(PyExc_StandardError,