X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.cpp;h=8ba68a593dea7625fa6a7ad4a3773e1cd7521172;hb=8b6a8658b1ea5aa358947a488c80eff75295d0fb;hp=1f1d17a742a69e3e31a54de0d6b17e828b0826e4;hpb=3b49e3b920ae79363037857acd70a8a5d5a1c11d;p=vuplus_dvbapp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 1f1d17a..8ba68a5 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 @@ -265,7 +275,7 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters diff = 1<<30; // big difference return 0; } - + switch (type) { case iDVBFrontend::feSatellite: @@ -273,7 +283,7 @@ 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) @@ -289,7 +299,7 @@ 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) diff = 1 << 29; else if (cable.inversion != ocable.inversion && cable.inversion != eDVBFrontendParametersCable::Inversion::Unknown && ocable.inversion != eDVBFrontendParametersCable::Inversion::Unknown) @@ -299,13 +309,13 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters 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); return 0; @@ -356,8 +366,7 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) m_tuneTimer = new eTimer(eApp); CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop); - int entries = sizeof(m_data) / sizeof(int); - for (int i=0; im_inuse) { eDebug("dont close frontend %d until the linked frontend %d is still in use", m_fe, linked_fe->m_frontend->getID()); return -1; } + linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (int&)linked_fe); } if (m_fd >= 0) { @@ -478,7 +487,7 @@ int eDVBFrontend::closeFrontend() m_fd=-1; else eWarning("couldnt close frontend %d", m_fe); - m_data[0] = m_data[1] = m_data[2] = -1; + m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; } #if HAVE_DVB_API_VERSION < 3 if (m_secfd >= 0) @@ -514,7 +523,7 @@ void eDVBFrontend::feEvent(int w) int res; int state; res = ::ioctl(m_fd, FE_GET_EVENT, &event); - + if (res && (errno == EAGAIN)) break; @@ -523,7 +532,7 @@ void eDVBFrontend::feEvent(int w) eWarning("FE_GET_EVENT failed! %m"); return; } - + if (w < 0) continue; @@ -541,8 +550,9 @@ void eDVBFrontend::feEvent(int w) state = stateTuning; else { + eDebug("stateLostLock"); state = stateLostLock; - m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc + m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc } } if (m_state != state) @@ -588,7 +598,7 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)"); return strength; } - case Locked: + case locked: { #if HAVE_DVB_API_VERSION < 3 FrontendStatus status=0; @@ -599,7 +609,7 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_STATUS failed (%m)"); return !!(status&FE_HAS_LOCK); } - case Synced: + case synced: { #if HAVE_DVB_API_VERSION < 3 FrontendStatus status=0; @@ -610,6 +620,8 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_STATUS failed (%m)"); return !!(status&FE_HAS_SYNC); } + case frontendNumber: + return m_fe; } return 0; } @@ -645,8 +657,8 @@ void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, e int freq_offset=0; int csw=0; const char *tmp=0; - fe->getData(0, csw); - fe->getData(9, freq_offset); + fe->getData(eDVBFrontend::CSW, csw); + fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset); int frequency = parm_frequency + freq_offset; PutToDict(dict, "frequency", frequency); PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate); @@ -674,35 +686,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"; @@ -966,8 +993,8 @@ PyObject *eDVBFrontend::readTransponderData(bool original) } PutToDict(ret, "tuner_state", tmp); - PutToDict(ret, "tuner_locked", readFrontendData(Locked)); - PutToDict(ret, "tuner_synced", readFrontendData(Synced)); + PutToDict(ret, "tuner_locked", readFrontendData(locked)); + PutToDict(ret, "tuner_synced", readFrontendData(synced)); PutToDict(ret, "tuner_bit_error_rate", readFrontendData(bitErrorRate)); PutToDict(ret, "tuner_signal_power", readFrontendData(signalPower)); PutToDict(ret, "tuner_signal_quality", readFrontendData(signalQuality)); @@ -976,6 +1003,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) { @@ -1170,7 +1198,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_TUNER_LOCKED_GOTO: { eSecCommand::rotor &cmd = m_sec_sequence.current()->measure; - if (readFrontendData(Locked)) + if (readFrontendData(locked)) { eDebug("[SEC] locked step %d ok", cmd.okcount); ++cmd.okcount; @@ -1232,19 +1260,19 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; } case eSecCommand::IF_ROTORPOS_VALID_GOTO: - if (m_data[5] != -1 && m_data[6] != -1) + if (m_data[ROTOR_CMD] != -1 && m_data[ROTOR_POS] != -1) setSecSequencePos(m_sec_sequence.current()->steps); else ++m_sec_sequence.current(); break; case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS: - m_data[5] = m_data[6] = -1; + m_data[ROTOR_CMD] = m_data[ROTOR_POS] = -1; eDebug("[SEC] invalidate current rotorparams"); ++m_sec_sequence.current(); break; case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: - m_data[5] = m_data[3]; - m_data[6] = m_data[4]; + m_data[ROTOR_CMD] = m_data[NEW_ROTOR_CMD]; + m_data[ROTOR_POS] = m_data[NEW_ROTOR_POS]; eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); ++m_sec_sequence.current(); break; @@ -1326,6 +1354,13 @@ 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", + feparm.system, + feparm.frequency, + feparm.polarisation, + feparm.symbol_rate, + feparm.inversion, + feparm.fec); parm_u_qpsk_symbol_rate = feparm.symbol_rate; switch (feparm.inversion) { @@ -1369,39 +1404,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 ) @@ -1641,6 +1681,12 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) int res=0; + if (!m_sn) + { + eDebug("no frontend device opened... do not try to tune !!!"); + return -ENODEV; + } + if (m_type == -1) return -ENODEV; @@ -1686,6 +1732,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) if (!res) { m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_PREV_PTR]; + if (linked_fe == (eDVBRegisteredFrontend*)-1) + { + std::string enable_5V; + ePythonConfigQuery::getConfigValue("config.terrestrial.enable_5V", enable_5V); + if (enable_5V == "yes") + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); + } m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } break; @@ -1861,7 +1915,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list) RESULT eDVBFrontend::getData(int num, int &data) { - if ( num < (int)(sizeof(m_data)/sizeof(int)) ) + if ( num < NUM_DATA_ENTRIES ) { data = m_data[num]; return 0; @@ -1871,7 +1925,7 @@ RESULT eDVBFrontend::getData(int num, int &data) RESULT eDVBFrontend::setData(int num, int val) { - if ( num < (int)(sizeof(m_data)/sizeof(int)) ) + if ( num < NUM_DATA_ENTRIES ) { m_data[num] = val; return 0;