X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/40f102b5f749e9d66236f0a1dafcbd403f10b013..3dfafb8052158a04e3f2316bf3b63a5a79ab331e:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 5d17f462..3905a187 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1,5 +1,6 @@ #include #include +#include // access to python config #include #include #include @@ -50,15 +51,24 @@ #ifdef FEC_9_10 #warning "FEC_9_10 already exist in dvb api ... it seems it is now ready for DVB-S2" #else - #define FEC_S2_1_2 (fe_code_rate_t)(FEC_AUTO+1) - #define FEC_S2_2_3 (fe_code_rate_t)(FEC_S2_1_2+1) - #define FEC_S2_3_4 (fe_code_rate_t)(FEC_S2_2_3+1) - #define FEC_S2_5_6 (fe_code_rate_t)(FEC_S2_3_4+1) - #define FEC_S2_7_8 (fe_code_rate_t)(FEC_S2_5_6+1) - #define FEC_S2_8_9 (fe_code_rate_t)(FEC_S2_7_8+1) - #define FEC_S2_3_5 (fe_code_rate_t)(FEC_S2_8_9+1) - #define FEC_S2_4_5 (fe_code_rate_t)(FEC_S2_3_5+1) - #define FEC_S2_9_10 (fe_code_rate_t)(FEC_S2_4_5+1) + #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_AUTO+1) + #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_S2_QPSK_1_2+1) + #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_S2_QPSK_2_3+1) + #define FEC_S2_QPSK_5_6 (fe_code_rate_t)(FEC_S2_QPSK_3_4+1) + #define FEC_S2_QPSK_7_8 (fe_code_rate_t)(FEC_S2_QPSK_5_6+1) + #define FEC_S2_QPSK_8_9 (fe_code_rate_t)(FEC_S2_QPSK_7_8+1) + #define FEC_S2_QPSK_3_5 (fe_code_rate_t)(FEC_S2_QPSK_8_9+1) + #define FEC_S2_QPSK_4_5 (fe_code_rate_t)(FEC_S2_QPSK_3_5+1) + #define FEC_S2_QPSK_9_10 (fe_code_rate_t)(FEC_S2_QPSK_4_5+1) + #define FEC_S2_8PSK_1_2 (fe_code_rate_t)(FEC_S2_QPSK_9_10+1) + #define FEC_S2_8PSK_2_3 (fe_code_rate_t)(FEC_S2_8PSK_1_2+1) + #define FEC_S2_8PSK_3_4 (fe_code_rate_t)(FEC_S2_8PSK_2_3+1) + #define FEC_S2_8PSK_5_6 (fe_code_rate_t)(FEC_S2_8PSK_3_4+1) + #define FEC_S2_8PSK_7_8 (fe_code_rate_t)(FEC_S2_8PSK_5_6+1) + #define FEC_S2_8PSK_8_9 (fe_code_rate_t)(FEC_S2_8PSK_7_8+1) + #define FEC_S2_8PSK_3_5 (fe_code_rate_t)(FEC_S2_8PSK_8_9+1) + #define FEC_S2_8PSK_4_5 (fe_code_rate_t)(FEC_S2_8PSK_3_5+1) + #define FEC_S2_8PSK_9_10 (fe_code_rate_t)(FEC_S2_8PSK_4_5+1) #endif #endif @@ -253,7 +263,7 @@ RESULT eDVBFrontendParameters::setDVBT(const eDVBFrontendParametersTerrestrial & return 0; } -RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters *parm, int &diff) const +RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters *parm, int &diff, bool exact) const { if (!parm) return -1; @@ -265,7 +275,7 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters diff = 1<<30; // big difference return 0; } - + switch (type) { case iDVBFrontend::feSatellite: @@ -273,11 +283,15 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters eDVBFrontendParametersSatellite osat; if (parm->getDVBS(osat)) return -2; - + if (sat.orbital_position != osat.orbital_position) diff = 1<<29; else if (sat.polarisation != osat.polarisation) diff = 1<<28; + else if (exact && sat.fec != osat.fec && sat.fec != eDVBFrontendParametersSatellite::FEC::fAuto && osat.fec != eDVBFrontendParametersSatellite::FEC::fAuto) + diff = 1<<27; + else if (exact && sat.modulation != osat.modulation && sat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto && osat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto) + diff = 1<<27; else { diff = abs(sat.frequency - osat.frequency); @@ -289,25 +303,55 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters eDVBFrontendParametersCable ocable; if (parm->getDVBC(ocable)) return -2; - - if (cable.modulation != ocable.modulation && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto) + + if (exact && cable.modulation != ocable.modulation + && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto + && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto) diff = 1 << 29; - else if (cable.inversion != ocable.inversion && cable.inversion != eDVBFrontendParametersCable::Inversion::Unknown && ocable.inversion != eDVBFrontendParametersCable::Inversion::Unknown) - diff = 1 << 28; + else if (exact && cable.fec_inner != ocable.fec_inner && cable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto && ocable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto) + diff = 1 << 27; else { diff = abs(cable.frequency - ocable.frequency); diff += abs(cable.symbol_rate - ocable.symbol_rate); } - return 0; case iDVBFrontend::feTerrestrial: eDVBFrontendParametersTerrestrial oterrestrial; if (parm->getDVBT(oterrestrial)) return -2; - - diff = abs(terrestrial.frequency - oterrestrial.frequency); + + if (exact && oterrestrial.bandwidth != terrestrial.bandwidth && + oterrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto && + terrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto) + diff = 1 << 30; + else if (exact && oterrestrial.modulation != terrestrial.modulation && + oterrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto && + terrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto) + diff = 1 << 30; + else if (exact && oterrestrial.transmission_mode != terrestrial.transmission_mode && + oterrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto && + terrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto) + diff = 1 << 30; + else if (exact && oterrestrial.guard_interval != terrestrial.guard_interval && + oterrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto && + terrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto) + diff = 1 << 30; + else if (exact && oterrestrial.hierarchy != terrestrial.hierarchy && + oterrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto && + terrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto) + diff = 1 << 30; + else if (exact && oterrestrial.code_rate_LP != terrestrial.code_rate_LP && + oterrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto && + terrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto) + diff = 1 << 30; + else if (exact && oterrestrial.code_rate_HP != terrestrial.code_rate_HP && + oterrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto && + terrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto) + diff = 1 << 30; + else + diff = abs(terrestrial.frequency - oterrestrial.frequency); return 0; default: return -1; @@ -513,7 +557,7 @@ void eDVBFrontend::feEvent(int w) int res; int state; res = ::ioctl(m_fd, FE_GET_EVENT, &event); - + if (res && (errno == EAGAIN)) break; @@ -522,7 +566,7 @@ void eDVBFrontend::feEvent(int w) eWarning("FE_GET_EVENT failed! %m"); return; } - + if (w < 0) continue; @@ -540,6 +584,7 @@ void eDVBFrontend::feEvent(int w) state = stateTuning; else { + eDebug("stateLostLock"); state = stateLostLock; m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc } @@ -675,35 +720,50 @@ void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, e tmp = "FEC_AUTO"; break; #if HAVE_DVB_API_VERSION >=3 - case FEC_S2_1_2: + case FEC_S2_8PSK_1_2: + case FEC_S2_QPSK_1_2: tmp = "FEC_1_2"; break; - case FEC_S2_2_3: + case FEC_S2_8PSK_2_3: + case FEC_S2_QPSK_2_3: tmp = "FEC_2_3"; break; - case FEC_S2_3_4: + case FEC_S2_8PSK_3_4: + case FEC_S2_QPSK_3_4: tmp = "FEC_3_4"; break; - case FEC_S2_5_6: + case FEC_S2_8PSK_5_6: + case FEC_S2_QPSK_5_6: tmp = "FEC_5_6"; break; - case FEC_S2_7_8: + case FEC_S2_8PSK_7_8: + case FEC_S2_QPSK_7_8: tmp = "FEC_7_8"; break; - case FEC_S2_8_9: + case FEC_S2_8PSK_8_9: + case FEC_S2_QPSK_8_9: tmp = "FEC_8_9"; break; - case FEC_S2_3_5: + case FEC_S2_8PSK_3_5: + case FEC_S2_QPSK_3_5: tmp = "FEC_3_5"; break; - case FEC_S2_4_5: + case FEC_S2_8PSK_4_5: + case FEC_S2_QPSK_4_5: tmp = "FEC_4_5"; break; - case FEC_S2_9_10: + case FEC_S2_8PSK_9_10: + case FEC_S2_QPSK_9_10: tmp = "FEC_9_10"; break; #endif } +#if HAVE_DVB_API_VERSION >=3 + PutToDict(dict, "modulation", + parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" ); +#else + PutToDict(dict, "modulation", "QPSK" ); +#endif PutToDict(dict, "fec_inner", tmp); tmp = parm_u_qpsk_fec_inner > FEC_AUTO ? "DVB-S2" : "DVB-S"; @@ -977,6 +1037,7 @@ PyObject *eDVBFrontend::readTransponderData(bool original) eDebug("FE_GET_FRONTEND (%m)"); else { + const FRONTENDPARAMETERS &parm = original ? this->parm : front; tmp = "INVERSION_AUTO"; switch(parm_inversion) { @@ -1289,8 +1350,9 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; } default: + eDebug("[SEC] unhandled sec command %d", + ++m_sec_sequence.current()->cmd); ++m_sec_sequence.current(); - eDebug("[SEC] unhandled sec command"); } m_tuneTimer->start(delay,true); } @@ -1327,6 +1389,14 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) res = m_sec->prepare(*this, parm, feparm, 1 << m_fe); if (!res) { + eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d", + feparm.system, + feparm.frequency, + feparm.polarisation, + feparm.symbol_rate, + feparm.inversion, + feparm.fec, + feparm.orbital_position); parm_u_qpsk_symbol_rate = feparm.symbol_rate; switch (feparm.inversion) { @@ -1370,39 +1440,44 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) } #if HAVE_DVB_API_VERSION >= 3 else // DVB_S2 + { switch (feparm.fec) { case eDVBFrontendParametersSatellite::FEC::f1_2: - parm_u_qpsk_fec_inner = FEC_S2_1_2; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2; break; case eDVBFrontendParametersSatellite::FEC::f2_3: - parm_u_qpsk_fec_inner = FEC_S2_2_3; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3; break; case eDVBFrontendParametersSatellite::FEC::f3_4: - parm_u_qpsk_fec_inner = FEC_S2_3_4; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4; break; case eDVBFrontendParametersSatellite::FEC::f3_5: - parm_u_qpsk_fec_inner = FEC_S2_3_5; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5; break; case eDVBFrontendParametersSatellite::FEC::f4_5: - parm_u_qpsk_fec_inner = FEC_S2_4_5; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5; break; case eDVBFrontendParametersSatellite::FEC::f5_6: - parm_u_qpsk_fec_inner = FEC_S2_5_6; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6; break; case eDVBFrontendParametersSatellite::FEC::f7_8: - parm_u_qpsk_fec_inner = FEC_S2_7_8; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8; break; case eDVBFrontendParametersSatellite::FEC::f8_9: - parm_u_qpsk_fec_inner = FEC_S2_8_9; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9; break; case eDVBFrontendParametersSatellite::FEC::f9_10: - parm_u_qpsk_fec_inner = FEC_S2_9_10; + parm_u_qpsk_fec_inner = FEC_S2_QPSK_9_10; break; default: eDebug("no valid fec for DVB-S2 set.. abort !!"); return -EINVAL; } + 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 + } #endif // FIXME !!! get frequency range from tuner if ( parm_frequency < 900000 || parm_frequency > 2200000 ) @@ -1642,8 +1717,18 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) int res=0; + if (!m_sn) + { + eDebug("no frontend device opened... do not try to tune !!!"); + res = -ENODEV; + goto tune_error; + } + if (m_type == -1) - return -ENODEV; + { + res = -ENODEV; + goto tune_error; + } m_sn->stop(); m_sec_sequence.clear(); @@ -1656,23 +1741,30 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) if (where.getDVBS(feparm)) { eDebug("no dvbs data!"); - return -EINVAL; + res = -EINVAL; + goto tune_error; } - res=prepare_sat(feparm); m_sec->setRotorMoving(false); + res=prepare_sat(feparm); + if (res) + goto tune_error; + break; } case feCable: { eDVBFrontendParametersCable feparm; if (where.getDVBC(feparm)) - return -EINVAL; - res=prepare_cable(feparm); - if (!res) { - m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + res = -EINVAL; + goto tune_error; } + res=prepare_cable(feparm); + if (res) + goto tune_error; + + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); break; } case feTerrestrial: @@ -1681,32 +1773,43 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) if (where.getDVBT(feparm)) { eDebug("no -T data"); - return -EINVAL; + res = -EINVAL; + goto tune_error; } res=prepare_terrestrial(feparm); - if (!res) - { - m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); - } + if (res) + goto tune_error; + + std::string enable_5V; + char configStr[255]; + snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_fe); + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + ePythonConfigQuery::getConfigValue(configStr, enable_5V); + if (enable_5V == "True") + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); + else + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + break; } } - if (!res) // prepare ok - { - m_tuneTimer->start(0,true); - m_sec_sequence.current() = m_sec_sequence.begin(); + m_tuneTimer->start(0,true); + m_sec_sequence.current() = m_sec_sequence.begin(); - if (m_state != stateTuning) - { - m_tuning = 1; - m_state = stateTuning; - m_stateChanged(this); - } + if (m_state != stateTuning) + { + m_tuning = 1; + m_state = stateTuning; + m_stateChanged(this); } return res; + +tune_error: + m_tuneTimer->stop(); + return res; } RESULT eDVBFrontend::connectStateChange(const Slot1 &stateChange, ePtr &connection) @@ -1717,7 +1820,7 @@ RESULT eDVBFrontend::connectStateChange(const Slot1 &stateCh RESULT eDVBFrontend::setVoltage(int voltage) { - if (m_type != feSatellite) + if (m_type == feCable) return -1; #if HAVE_DVB_API_VERSION < 3 secVoltage vlt; @@ -1759,7 +1862,7 @@ RESULT eDVBFrontend::setVoltage(int voltage) #if HAVE_DVB_API_VERSION < 3 return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt); #else - if (::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0) + if (m_type == feSatellite && ::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0) perror("FE_ENABLE_HIGH_LNB_VOLTAGE"); return ::ioctl(m_fd, FE_SET_VOLTAGE, vlt); #endif