X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a8bb7bff847ea237903e6ac8e5ee0c22b10ef603..b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 97d8553e..3ae9473e 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 @@ -47,6 +48,28 @@ #define parm_u_ofdm_transmission_mode parm.u.ofdm.transmission_mode #define parm_u_ofdm_guard_interval parm.u.ofdm.guard_interval #define parm_u_ofdm_hierarchy_information parm.u.ofdm.hierarchy_information +#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_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 #include @@ -99,8 +122,8 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto symbol_rate = descriptor.getSymbolRate() * 100; polarisation = descriptor.getPolarization(); fec = descriptor.getFecInner(); - if ( fec == 0xF ) - fec = FEC::fNone; + if ( fec != FEC::fNone && fec > FEC::f9_10 ) + fec = FEC::fAuto; inversion = Inversion::Unknown; orbital_position = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000; orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100; @@ -108,11 +131,32 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto orbital_position += ((descriptor.getOrbitalPosition()) & 0xF); if (orbital_position && (!descriptor.getWestEastFlag())) orbital_position = 3600 - orbital_position; - eDebug("SAT freq %d, %s, pos %d, sr %d, fec %d", - frequency, - polarisation ? "hor" : "vert", - orbital_position, - symbol_rate, fec); + system = descriptor.getModulationSystem(); + modulation = descriptor.getModulation(); + if (system == System::DVB_S && modulation == Modulation::M8PSK) + { + eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK"); + modulation=QPSK; + } + roll_off = 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", + frequency, + polarisation ? "hor" : "vert", + orbital_position, + symbol_rate, fec, + modulation, + roll_off); + } + else + { + eDebug("SAT DVB-S freq %d, %s, pos %d, sr %d, fec %d", + frequency, + polarisation ? "hor" : "vert", + orbital_position, + symbol_rate, fec); + } } void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descriptor) @@ -144,7 +188,7 @@ void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescr if (code_rate_LP > 4) code_rate_LP = FEC::fAuto; transmission_mode = descriptor.getTransmissionMode(); - if (transmission_mode > 2) + if (transmission_mode > 1) // TM4k forced to auto transmission_mode = TransmissionMode::TMAuto; guard_interval = descriptor.getGuardInterval(); if (guard_interval > 3) @@ -219,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; @@ -231,7 +275,7 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters diff = 1<<30; // big difference return 0; } - + switch (type) { case iDVBFrontend::feSatellite: @@ -239,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); @@ -255,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; @@ -305,7 +383,7 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const DEFINE_REF(eDVBFrontend); eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) - :m_type(-1), m_fe(fe), m_fd(-1), m_timeout(0), m_tuneTimer(0) + :m_type(-1), m_fe(fe), m_fd(-1), m_sn(0), m_timeout(0), m_tuneTimer(0) #if HAVE_DVB_API_VERSION < 3 ,m_secfd(-1) #endif @@ -322,8 +400,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; i= 0) + if (m_sn) return -1; // already opened m_state=0; m_tuning=0; #if HAVE_DVB_API_VERSION < 3 - m_secfd = ::open(m_sec_filename, O_RDWR); if (m_secfd < 0) { - eWarning("failed! (%s) %m", m_sec_filename); - return -1; + m_secfd = ::open(m_sec_filename, O_RDWR); + if (m_secfd < 0) + { + eWarning("failed! (%s) %m", m_sec_filename); + return -1; + } } + else + eWarning("sec %d already opened", m_fe); FrontendInfo fe_info; #else dvb_frontend_info fe_info; #endif eDebug("opening frontend %d", m_fe); - m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK); if (m_fd < 0) { - eWarning("failed! (%s) %m", m_filename); + m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK); + if (m_fd < 0) + { + eWarning("failed! (%s) %m", m_filename); #if HAVE_DVB_API_VERSION < 3 - ::close(m_secfd); - m_secfd=-1; + ::close(m_secfd); + m_secfd=-1; #endif - return -1; + return -1; + } } - + else + eWarning("frontend %d already opened", m_fe); if (m_type == -1) { if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0) @@ -412,16 +498,16 @@ int eDVBFrontend::openFrontend() int eDVBFrontend::closeFrontend() { - if (!m_fe && m_data[7] != -1) + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_NEXT_PTR]; + while (linked_fe != (eDVBRegisteredFrontend*)-1) { - // try to close the first frontend.. but the second is linked to the first - eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[7]; if (linked_fe->m_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) { @@ -431,15 +517,19 @@ int eDVBFrontend::closeFrontend() setVoltage(iDVBFrontend::voltageOff); if (m_sec) m_sec->setRotorMoving(false); - ::close(m_fd); - m_fd=-1; - m_data[0] = m_data[1] = m_data[2] = -1; + if (!::close(m_fd)) + m_fd=-1; + else + eWarning("couldnt close frontend %d", m_fe); + m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; } #if HAVE_DVB_API_VERSION < 3 if (m_secfd >= 0) { - ::close(m_secfd); - m_secfd=-1; + if (!::close(m_secfd)) + m_secfd=-1; + else + eWarning("couldnt close sec %d", m_fe); } #endif delete m_sn; @@ -467,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; @@ -476,7 +566,7 @@ void eDVBFrontend::feEvent(int w) eWarning("FE_GET_EVENT failed! %m"); return; } - + if (w < 0) continue; @@ -494,8 +584,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) @@ -541,7 +632,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; @@ -552,7 +643,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; @@ -563,13 +654,15 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_STATUS failed (%m)"); return !!(status&FE_HAS_SYNC); } + case frontendNumber: + return m_fe; } return 0; } -void PutToDict(PyObject *dict, const char*key, long value) +void PutToDict(ePyObject &dict, const char*key, long value) { - PyObject *item = PyInt_FromLong(value); + ePyObject item = PyInt_FromLong(value); if (item) { if (PyDict_SetItemString(dict, key, item)) @@ -580,9 +673,9 @@ void PutToDict(PyObject *dict, const char*key, long value) eDebug("could not create PyObject for %s", key); } -void PutToDict(PyObject *dict, const char*key, const char *value) +void PutToDict(ePyObject &dict, const char*key, const char *value) { - PyObject *item = PyString_FromString(value); + ePyObject item = PyString_FromString(value); if (item) { if (PyDict_SetItemString(dict, key, item)) @@ -593,43 +686,91 @@ void PutToDict(PyObject *dict, const char*key, const char *value) eDebug("could not create PyObject for %s", key); } -void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe) +void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe) { int freq_offset=0; int csw=0; - const char *fec=0; - fe->getData(0, csw); - fe->getData(9, freq_offset); + 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); PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate); - switch(parm_u_qpsk_fec_inner) { case FEC_1_2: - fec = "FEC_1_2"; + tmp = "FEC_1_2"; break; case FEC_2_3: - fec = "FEC_2_3"; + tmp = "FEC_2_3"; break; case FEC_3_4: - fec = "FEC_3_4"; + tmp = "FEC_3_4"; break; case FEC_5_6: - fec = "FEC_5_6"; + tmp = "FEC_5_6"; break; case FEC_7_8: - fec = "FEC_7_8"; + tmp = "FEC_7_8"; break; + case FEC_NONE: + tmp = "FEC_NONE"; default: case FEC_AUTO: - fec = "FEC_AUTO"; + tmp = "FEC_AUTO"; break; +#if HAVE_DVB_API_VERSION >=3 + case FEC_S2_8PSK_1_2: + case FEC_S2_QPSK_1_2: + tmp = "FEC_1_2"; + break; + case FEC_S2_8PSK_2_3: + case FEC_S2_QPSK_2_3: + tmp = "FEC_2_3"; + break; + case FEC_S2_8PSK_3_4: + case FEC_S2_QPSK_3_4: + tmp = "FEC_3_4"; + break; + case FEC_S2_8PSK_5_6: + case FEC_S2_QPSK_5_6: + tmp = "FEC_5_6"; + break; + case FEC_S2_8PSK_7_8: + case FEC_S2_QPSK_7_8: + tmp = "FEC_7_8"; + break; + case FEC_S2_8PSK_8_9: + case FEC_S2_QPSK_8_9: + tmp = "FEC_8_9"; + break; + case FEC_S2_8PSK_3_5: + case FEC_S2_QPSK_3_5: + tmp = "FEC_3_5"; + break; + case FEC_S2_8PSK_4_5: + case FEC_S2_QPSK_4_5: + tmp = "FEC_4_5"; + break; + case FEC_S2_8PSK_9_10: + case FEC_S2_QPSK_9_10: + tmp = "FEC_9_10"; + break; +#endif } - PutToDict(dict, "fec_inner", fec); +#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"; + PutToDict(dict, "system", tmp); } -void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm) +void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm) { const char *tmp=0; PutToDict(dict, "frequency", parm_frequency/1000); @@ -690,7 +831,7 @@ void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm) PutToDict(dict, "modulation", tmp); } -void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm) +void fillDictWithTerrestrialData(ePyObject dict, const FRONTENDPARAMETERS &parm) { const char *tmp=0; PutToDict(dict, "frequency", parm_frequency); @@ -830,17 +971,97 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm) PutToDict(dict, "hierarchy_information", tmp); } -PyObject *eDVBFrontend::readTransponderData(bool original) +void eDVBFrontend::getFrontendStatus(ePyObject dest) { - PyObject *ret=PyDict_New(); + if (dest && PyDict_Check(dest)) + { + const char *tmp = "UNKNOWN"; + switch(m_state) + { + case stateIdle: + tmp="IDLE"; + break; + case stateTuning: + tmp="TUNING"; + break; + case stateFailed: + tmp="FAILED"; + break; + case stateLock: + tmp="LOCKED"; + break; + case stateLostLock: + tmp="LOSTLOCK"; + break; + default: + break; + } + PutToDict(dest, "tuner_state", tmp); + PutToDict(dest, "tuner_locked", readFrontendData(locked)); + PutToDict(dest, "tuner_synced", readFrontendData(synced)); + PutToDict(dest, "tuner_bit_error_rate", readFrontendData(bitErrorRate)); + PutToDict(dest, "tuner_signal_power", readFrontendData(signalPower)); + PutToDict(dest, "tuner_signal_quality", readFrontendData(signalQuality)); + } +} - if (ret) +void eDVBFrontend::getTransponderData(ePyObject dest, bool original) +{ + if (m_fd != -1 && dest && PyDict_Check(dest)) { - bool read=m_fd != -1; - const char *tmp=0; + switch(m_type) + { + case feSatellite: + case feCable: + case feTerrestrial: + { + FRONTENDPARAMETERS front; + if (!original && ioctl(m_fd, FE_GET_FRONTEND, &front)<0) + eDebug("FE_GET_FRONTEND (%m)"); + else + { + const FRONTENDPARAMETERS &parm = original ? this->parm : front; + const char *tmp = "INVERSION_AUTO"; + switch(parm_inversion) + { + case INVERSION_ON: + tmp = "INVERSION_ON"; + break; + case INVERSION_OFF: + tmp = "INVERSION_OFF"; + break; + default: + break; + } + if (tmp) + PutToDict(dest, "inversion", tmp); - PutToDict(ret, "tuner_number", m_fe); + switch(m_type) + { + case feSatellite: + fillDictWithSatelliteData(dest, original?parm:front, this); + break; + case feCable: + fillDictWithCableData(dest, original?parm:front); + break; + case feTerrestrial: + fillDictWithTerrestrialData(dest, original?parm:front); + break; + } + } + } + default: + break; + } + } +} +void eDVBFrontend::getFrontendData(ePyObject dest) +{ + if (dest && PyDict_Check(dest)) + { + const char *tmp=0; + PutToDict(dest, "tuner_number", m_fe); switch(m_type) { case feSatellite: @@ -854,84 +1075,10 @@ PyObject *eDVBFrontend::readTransponderData(bool original) break; default: tmp = "UNKNOWN"; - read=false; break; } - PutToDict(ret, "tuner_type", tmp); - - if (read) - { - FRONTENDPARAMETERS front; - - tmp = "UNKNOWN"; - switch(m_state) - { - case stateIdle: - tmp="IDLE"; - break; - case stateTuning: - tmp="TUNING"; - break; - case stateFailed: - tmp="FAILED"; - break; - case stateLock: - tmp="LOCKED"; - break; - case stateLostLock: - tmp="LOSTLOCK"; - break; - default: - break; - } - PutToDict(ret, "tuner_state", tmp); - - 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)); - - if (!original && ioctl(m_fd, FE_GET_FRONTEND, &front)<0) - eDebug("FE_GET_FRONTEND (%m)"); - else - { - tmp = "INVERSION_AUTO"; - switch(parm_inversion) - { - case INVERSION_ON: - tmp = "INVERSION_ON"; - break; - case INVERSION_OFF: - tmp = "INVERSION_OFF"; - break; - default: - break; - } - if (tmp) - PutToDict(ret, "inversion", tmp); - - switch(m_type) - { - case feSatellite: - fillDictWithSatelliteData(ret, original?parm:front, this); - break; - case feCable: - fillDictWithCableData(ret, original?parm:front); - break; - case feTerrestrial: - fillDictWithTerrestrialData(ret, original?parm:front); - break; - } - } - } - } - else - { - Py_INCREF(Py_None); - ret = Py_None; + PutToDict(dest, "tuner_type", tmp); } - return ret; } #ifndef FP_IOCTL_GET_ID @@ -1005,7 +1152,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_VOLTAGE_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) ) + if ( compare.voltage == m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; @@ -1013,7 +1160,23 @@ 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_curVoltage && setSecSequencePos(compare.steps) ) + if ( compare.voltage != m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } + case eSecCommand::IF_TONE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.tone == m_data[CUR_TONE] && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } + case eSecCommand::IF_NOT_TONE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.tone != m_data[CUR_TONE] && setSecSequencePos(compare.steps) ) break; ++m_sec_sequence.current(); break; @@ -1072,7 +1235,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO: { eSecCommand::pair &compare = m_sec_sequence.current()->compare; - int idx = compare.voltage; + int idx = compare.val; if ( idx == 0 || idx == 1 ) { int idle = readInputpower(); @@ -1090,7 +1253,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; @@ -1119,7 +1282,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; case eSecCommand::IF_INPUTPOWER_DELTA_GOTO: { - int idleInputpower = m_idleInputpower[ (m_curVoltage&1) ? 0 : 1]; + int idleInputpower = m_idleInputpower[ (m_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", @@ -1152,19 +1315,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; @@ -1208,8 +1371,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); } @@ -1246,6 +1410,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) { @@ -1260,30 +1432,74 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) parm_inversion = INVERSION_AUTO; break; } - switch (feparm.fec) + if (feparm.system == eDVBFrontendParametersSatellite::System::DVB_S) + switch (feparm.fec) + { + case eDVBFrontendParametersSatellite::FEC::fNone: + parm_u_qpsk_fec_inner = FEC_NONE; + break; + case eDVBFrontendParametersSatellite::FEC::f1_2: + parm_u_qpsk_fec_inner = FEC_1_2; + break; + case eDVBFrontendParametersSatellite::FEC::f2_3: + parm_u_qpsk_fec_inner = FEC_2_3; + break; + case eDVBFrontendParametersSatellite::FEC::f3_4: + parm_u_qpsk_fec_inner = FEC_3_4; + break; + case eDVBFrontendParametersSatellite::FEC::f5_6: + parm_u_qpsk_fec_inner = FEC_5_6; + break; + case eDVBFrontendParametersSatellite::FEC::f7_8: + parm_u_qpsk_fec_inner = FEC_7_8; + break; + default: + eDebug("no valid fec for DVB-S set.. assume auto"); + case eDVBFrontendParametersSatellite::FEC::fAuto: + parm_u_qpsk_fec_inner = FEC_AUTO; + break; + } +#if HAVE_DVB_API_VERSION >= 3 + else // DVB_S2 { - default: - case eDVBFrontendParametersSatellite::FEC::fNone: - eDebug("no fec set.. assume auto"); - case eDVBFrontendParametersSatellite::FEC::fAuto: - parm_u_qpsk_fec_inner = FEC_AUTO; - break; - case eDVBFrontendParametersSatellite::FEC::f1_2: - parm_u_qpsk_fec_inner = FEC_1_2; - break; - case eDVBFrontendParametersSatellite::FEC::f2_3: - parm_u_qpsk_fec_inner = FEC_2_3; - break; - case eDVBFrontendParametersSatellite::FEC::f3_4: - parm_u_qpsk_fec_inner = FEC_3_4; - break; - case eDVBFrontendParametersSatellite::FEC::f5_6: - parm_u_qpsk_fec_inner = FEC_5_6; - break; - case eDVBFrontendParametersSatellite::FEC::f7_8: - parm_u_qpsk_fec_inner = FEC_7_8; - break; + switch (feparm.fec) + { + case eDVBFrontendParametersSatellite::FEC::f1_2: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2; + break; + case eDVBFrontendParametersSatellite::FEC::f2_3: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3; + break; + case eDVBFrontendParametersSatellite::FEC::f3_4: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4; + break; + case eDVBFrontendParametersSatellite::FEC::f3_5: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5; + break; + case eDVBFrontendParametersSatellite::FEC::f4_5: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5; + break; + case eDVBFrontendParametersSatellite::FEC::f5_6: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6; + break; + case eDVBFrontendParametersSatellite::FEC::f7_8: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8; + break; + case eDVBFrontendParametersSatellite::FEC::f8_9: + parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9; + break; + case eDVBFrontendParametersSatellite::FEC::f9_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 ) { @@ -1364,6 +1580,12 @@ RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm) parm_u_qam_fec_inner = FEC_AUTO; break; } + eDebug("tuning to %d khz, sr %d, fec %d, modulation %d, inversion %d", + parm_frequency/1000, + parm_u_qam_symbol_rate, + parm_u_qam_fec_inner, + parm_u_qam_modulation, + parm_inversion); return 0; } @@ -1522,8 +1744,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(); @@ -1536,23 +1768,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: @@ -1561,32 +1800,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) @@ -1597,7 +1847,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; @@ -1605,7 +1855,7 @@ RESULT eDVBFrontend::setVoltage(int voltage) bool increased=false; fe_sec_voltage_t vlt; #endif - m_curVoltage=voltage; + m_data[CUR_VOLTAGE]=voltage; switch (voltage) { case voltageOff: @@ -1639,7 +1889,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 @@ -1660,7 +1910,7 @@ RESULT eDVBFrontend::setTone(int t) #else fe_sec_tone_mode_t tone; #endif - + m_data[CUR_TONE]=t; switch (t) { case toneOn: @@ -1742,7 +1992,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; @@ -1752,7 +2002,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; @@ -1770,8 +2020,11 @@ int eDVBFrontend::isCompatibleWith(ePtr &feparm) { ASSERT(m_sec); eDVBFrontendParametersSatellite sat_parm; - ASSERT(!feparm->getDVBS(sat_parm)); + int ret = feparm->getDVBS(sat_parm); + ASSERT(!ret); return m_sec->canTune(sat_parm, this, 1 << m_fe); } + else if (m_type == eDVBFrontend::feCable) + return 2; // more prio for cable frontends return 1; }