X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/af6a8a3a102ff0230fcc6d90ad213e2e7d706fa8..b0423085db164b3bc28291fab6bd5741182a6859:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index f44b3fba..1040d7cd 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 @@ -17,36 +18,112 @@ #define BANDWIDTH_AUTO (BandWidth)3 #define GUARD_INTERVAL_AUTO (GuardInterval)4 #define HIERARCHY_AUTO (Hierarchy)4 -#define parm.frequency parm.Frequency -#define parm.inversion parm.Inversion -#define parm.u.qpsk.symbol_rate parm.u.qpsk.SymbolRate -#define parm.u.qpsk.fec_inner parm.u.qpsk.FEC_inner -#define parm.u.qam.symbol_rate parm.u.qam.SymbolRate -#define parm.u.qam.fec_inner parm.u.qam.FEC_inner -#define parm.u.qam.modulation parm.u.qam.QAM -#define parm.u.ofdm.bandwidth parm.u.ofdm.bandWidth -#define parm.u.ofdm.code_rate_LP parm.u.ofdm.LP_CodeRate -#define parm.u.ofdm.code_rate_HP parm.u.ofdm.HP_CodeRate -#define parm.u.ofdm.constellation parm.u.ofdm.Constellation -#define parm.u.ofdm.transmission_mode parm.u.ofdm.TransmissionMode -#define parm.u.ofdm.guard_interval parm.u.ofdm.guardInterval -#define parm.u.ofdm.hierarchy_information parm.u.ofdm.HierarchyInformation +#define parm_frequency parm.Frequency +#define parm_inversion parm.Inversion +#define parm_u_qpsk_symbol_rate parm.u.qpsk.SymbolRate +#define parm_u_qpsk_fec_inner parm.u.qpsk.FEC_inner +#define parm_u_qam_symbol_rate parm.u.qam.SymbolRate +#define parm_u_qam_fec_inner parm.u.qam.FEC_inner +#define parm_u_qam_modulation parm.u.qam.QAM +#define parm_u_ofdm_bandwidth parm.u.ofdm.bandWidth +#define parm_u_ofdm_code_rate_LP parm.u.ofdm.LP_CodeRate +#define parm_u_ofdm_code_rate_HP parm.u.ofdm.HP_CodeRate +#define parm_u_ofdm_constellation parm.u.ofdm.Constellation +#define parm_u_ofdm_transmission_mode parm.u.ofdm.TransmissionMode +#define parm_u_ofdm_guard_interval parm.u.ofdm.guardInterval +#define parm_u_ofdm_hierarchy_information parm.u.ofdm.HierarchyInformation #else #include +#define parm_frequency parm.frequency +#define parm_inversion parm.inversion +#define parm_u_qpsk_symbol_rate parm.u.qpsk.symbol_rate +#define parm_u_qpsk_fec_inner parm.u.qpsk.fec_inner +#define parm_u_qam_symbol_rate parm.u.qam.symbol_rate +#define parm_u_qam_fec_inner parm.u.qam.fec_inner +#define parm_u_qam_modulation parm.u.qam.modulation +#define parm_u_ofdm_bandwidth parm.u.ofdm.bandwidth +#define parm_u_ofdm_code_rate_LP parm.u.ofdm.code_rate_LP +#define parm_u_ofdm_code_rate_HP parm.u.ofdm.code_rate_HP +#define parm_u_ofdm_constellation parm.u.ofdm.constellation +#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 #include #include +void eDVBDiseqcCommand::setCommandString(const char *str) +{ + if (!str) + return; + len=0; + int slen = strlen(str); + if (slen % 2) + { + eDebug("invalid diseqc command string length (not 2 byte aligned)"); + return; + } + if (slen > MAX_DISEQC_LENGTH*2) + { + eDebug("invalid diseqc command string length (string is to long)"); + return; + } + unsigned char val=0; + for (int i=0; i < slen; ++i) + { + unsigned char c = str[i]; + switch(c) + { + case '0' ... '9': c-=48; break; + case 'a' ... 'f': c-=87; break; + case 'A' ... 'F': c-=55; break; + default: + eDebug("invalid character in hex string..ignore complete diseqc command !"); + return; + } + if ( i % 2 ) + { + val |= c; + data[i/2] = val; + } + else + val = c << 4; + } + len = slen/2; +} + void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor) { frequency = descriptor.getFrequency() * 10; 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; @@ -54,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) @@ -90,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) @@ -143,9 +241,10 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con return 0; } -RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p) +RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune) { sat = p; + sat.no_rotor_command_on_tune = no_rotor_command_on_tune; m_type = iDVBFrontend::feSatellite; return 0; } @@ -176,7 +275,7 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters diff = 1<<30; // big difference return 0; } - + switch (type) { case iDVBFrontend::feSatellite: @@ -184,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) @@ -200,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) @@ -210,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; @@ -226,7 +325,7 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters return 0; } -RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const +RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const { switch (m_type) { @@ -237,7 +336,11 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const return 0; } case iDVBFrontend::feCable: + hash = 0xFFFF0000; + return 0; case iDVBFrontend::feTerrestrial: + hash = 0xEEEE0000; + return 0; default: return -1; } @@ -246,7 +349,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 @@ -263,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; 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) @@ -347,38 +458,44 @@ int eDVBFrontend::openFrontend() m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read); CONNECT(m_sn->activated, eDVBFrontend::feEvent); - m_sn->start(); return 0; } 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) { eDebug("close frontend %d", m_fe); + m_tuneTimer->stop(); setTone(iDVBFrontend::toneOff); setVoltage(iDVBFrontend::voltageOff); - ::close(m_fd); - m_fd=-1; - m_data[0] = m_data[1] = m_data[2] = -1; + if (m_sec) + m_sec->setRotorMoving(false); + 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; @@ -406,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; @@ -415,7 +532,7 @@ void eDVBFrontend::feEvent(int w) eWarning("FE_GET_EVENT failed! %m"); return; } - + if (w < 0) continue; @@ -433,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) @@ -480,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; @@ -491,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; @@ -502,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; } @@ -536,62 +656,285 @@ void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, e { int freq_offset=0; int csw=0; - fe->getData(0, csw); - fe->getData(9, freq_offset); - int frequency = parm.frequency + 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, "inversion", parm.inversion); - PutToDict(dict, "symbol_rate", parm.u.qpsk.symbol_rate); - const char *fec=0; - switch(parm.u.qpsk.fec_inner) + PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate); + switch(parm_u_qpsk_fec_inner) { - case FEC_1_2: - fec = "FEC_1_2"; - break; - case FEC_2_3: - fec = "FEC_2_3"; - break; - case FEC_3_4: - fec = "FEC_3_4"; - break; - case FEC_5_6: - fec = "FEC_5_6"; - break; - case FEC_7_8: - fec = "FEC_7_8"; - break; - default: - case FEC_AUTO: - fec = "FEC_AUTO"; - break; + case FEC_1_2: + tmp = "FEC_1_2"; + break; + case FEC_2_3: + tmp = "FEC_2_3"; + break; + case FEC_3_4: + tmp = "FEC_3_4"; + break; + case FEC_5_6: + tmp = "FEC_5_6"; + break; + case FEC_7_8: + tmp = "FEC_7_8"; + break; + case FEC_NONE: + tmp = "FEC_NONE"; + default: + case 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) { -/* -#define parm.frequency parm.Frequency -#define parm.inversion parm.Inversion -#define parm.u.qam.symbol_rate parm.u.qam.SymbolRate -#define parm.u.qam.fec_inner parm.u.qam.FEC_inner -#define parm.u.qam.modulation parm.u.qam.QAM -*/ + const char *tmp=0; + PutToDict(dict, "frequency", parm_frequency/1000); + PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate); + switch(parm_u_qam_fec_inner) + { + case FEC_NONE: + tmp = "FEC_NONE"; + break; + case FEC_1_2: + tmp = "FEC_1_2"; + break; + case FEC_2_3: + tmp = "FEC_2_3"; + break; + case FEC_3_4: + tmp = "FEC_3_4"; + break; + case FEC_5_6: + tmp = "FEC_5_6"; + break; + case FEC_7_8: + tmp = "FEC_7_8"; + break; +#if HAVE_DVB_API_VERSION >= 3 + case FEC_8_9: + tmp = "FEC_8_9"; + break; +#endif + default: + case FEC_AUTO: + tmp = "FEC_AUTO"; + break; + } + PutToDict(dict, "fec_inner", tmp); + switch(parm_u_qam_modulation) + { + case QAM_16: + tmp = "QAM_16"; + break; + case QAM_32: + tmp = "QAM_32"; + break; + case QAM_64: + tmp = "QAM_64"; + break; + case QAM_128: + tmp = "QAM_128"; + break; + case QAM_256: + tmp = "QAM_256"; + break; + default: + case QAM_AUTO: + tmp = "QAM_AUTO"; + break; + } + PutToDict(dict, "modulation", tmp); } void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm) { -/* -#define parm.frequency parm.Frequency -#define parm.inversion parm.Inversion -#define parm.u.ofdm.bandwidth parm.u.ofdm.bandWidth -#define parm.u.ofdm.code_rate_LP parm.u.ofdm.LP_CodeRate -#define parm.u.ofdm.code_rate_HP parm.u.ofdm.HP_CodeRate -#define parm.u.ofdm.constellation parm.u.ofdm.Constellation -#define parm.u.ofdm.transmission_mode parm.u.ofdm.TransmissionMode -#define parm.u.ofdm.guard_interval parm.u.ofdm.guardInterval -#define parm.u.ofdm.hierarchy_information parm.u.ofdm.HierarchyInformation -*/ + const char *tmp=0; + PutToDict(dict, "frequency", parm_frequency); + switch (parm_u_ofdm_bandwidth) + { + case BANDWIDTH_8_MHZ: + tmp = "BANDWIDTH_8_MHZ"; + break; + case BANDWIDTH_7_MHZ: + tmp = "BANDWIDTH_7_MHZ"; + break; + case BANDWIDTH_6_MHZ: + tmp = "BANDWIDTH_6_MHZ"; + break; + default: + case BANDWIDTH_AUTO: + tmp = "BANDWIDTH_AUTO"; + break; + } + PutToDict(dict, "bandwidth", tmp); + switch (parm_u_ofdm_code_rate_LP) + { + case FEC_1_2: + tmp = "FEC_1_2"; + break; + case FEC_2_3: + tmp = "FEC_2_3"; + break; + case FEC_3_4: + tmp = "FEC_3_4"; + break; + case FEC_5_6: + tmp = "FEC_5_6"; + break; + case FEC_7_8: + tmp = "FEC_7_8"; + break; + default: + case FEC_AUTO: + tmp = "FEC_AUTO"; + break; + } + PutToDict(dict, "code_rate_lp", tmp); + switch (parm_u_ofdm_code_rate_HP) + { + case FEC_1_2: + tmp = "FEC_1_2"; + break; + case FEC_2_3: + tmp = "FEC_2_3"; + break; + case FEC_3_4: + tmp = "FEC_3_4"; + break; + case FEC_5_6: + tmp = "FEC_5_6"; + break; + case FEC_7_8: + tmp = "FEC_7_8"; + break; + default: + case FEC_AUTO: + tmp = "FEC_AUTO"; + break; + } + PutToDict(dict, "code_rate_hp", tmp); + switch (parm_u_ofdm_constellation) + { + case QPSK: + tmp = "QPSK"; + break; + case QAM_16: + tmp = "QAM_16"; + break; + case QAM_64: + tmp = "QAM_64"; + break; + default: + case QAM_AUTO: + tmp = "QAM_AUTO"; + break; + } + PutToDict(dict, "constellation", tmp); + switch (parm_u_ofdm_transmission_mode) + { + case TRANSMISSION_MODE_2K: + tmp = "TRANSMISSION_MODE_2K"; + break; + case TRANSMISSION_MODE_8K: + tmp = "TRANSMISSION_MODE_8K"; + break; + default: + case TRANSMISSION_MODE_AUTO: + tmp = "TRANSMISSION_MODE_AUTO"; + break; + } + PutToDict(dict, "transmission_mode", tmp); + switch (parm_u_ofdm_guard_interval) + { + case GUARD_INTERVAL_1_32: + tmp = "GUARD_INTERVAL_1_32"; + break; + case GUARD_INTERVAL_1_16: + tmp = "GUARD_INTERVAL_1_16"; + break; + case GUARD_INTERVAL_1_8: + tmp = "GUARD_INTERVAL_1_8"; + break; + case GUARD_INTERVAL_1_4: + tmp = "GUARD_INTERVAL_1_4"; + break; + default: + case GUARD_INTERVAL_AUTO: + tmp = "GUARD_INTERVAL_AUTO"; + break; + } + PutToDict(dict, "guard_interval", tmp); + switch (parm_u_ofdm_hierarchy_information) + { + case HIERARCHY_NONE: + tmp = "HIERARCHY_NONE"; + break; + case HIERARCHY_1: + tmp = "HIERARCHY_1"; + break; + case HIERARCHY_2: + tmp = "HIERARCHY_2"; + break; + case HIERARCHY_4: + tmp = "HIERARCHY_4"; + break; + default: + case HIERARCHY_AUTO: + tmp = "HIERARCHY_AUTO"; + break; + } + PutToDict(dict, "hierarchy_information", tmp); } PyObject *eDVBFrontend::readTransponderData(bool original) @@ -601,9 +944,9 @@ PyObject *eDVBFrontend::readTransponderData(bool original) if (ret) { bool read=m_fd != -1; - const char *tmp = "unknown"; + const char *tmp=0; - PutToDict(ret, "tuner number", m_fe); + PutToDict(ret, "tuner_number", m_fe); switch(m_type) { @@ -611,54 +954,71 @@ PyObject *eDVBFrontend::readTransponderData(bool original) tmp = "DVB-S"; break; case feCable: - tmp="DVB-C"; + tmp = "DVB-C"; break; case feTerrestrial: - tmp="DVB-T"; + tmp = "DVB-T"; break; default: + tmp = "UNKNOWN"; read=false; break; } - PutToDict(ret, "tuner type", tmp); + PutToDict(ret, "tuner_type", tmp); if (read) { FRONTENDPARAMETERS front; - tmp = "unknown"; + tmp = "UNKNOWN"; switch(m_state) { case stateIdle: - tmp="idle"; + tmp="IDLE"; break; case stateTuning: - tmp="tuning"; + tmp="TUNING"; break; case stateFailed: - tmp="failed"; + tmp="FAILED"; break; case stateLock: - tmp="lock"; + tmp="LOCKED"; break; case stateLostLock: - tmp="lostlock"; + tmp="LOSTLOCK"; break; default: break; } - PutToDict(ret, "tuner state", tmp); + 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)); + 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 { + const FRONTENDPARAMETERS &parm = original ? this->parm : front; + 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: @@ -838,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; @@ -900,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; @@ -966,6 +1326,8 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer void eDVBFrontend::setFrontend() { eDebug("setting frontend %d", m_fe); + m_sn->start(); + feEvent(-1); if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1) { perror("FE_SET_FRONTEND failed"); @@ -992,114 +1354,173 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) res = m_sec->prepare(*this, parm, feparm, 1 << m_fe); if (!res) { - parm.u.qpsk.symbol_rate = feparm.symbol_rate; + 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) { case eDVBFrontendParametersSatellite::Inversion::On: - parm.inversion = INVERSION_ON; + parm_inversion = INVERSION_ON; break; case eDVBFrontendParametersSatellite::Inversion::Off: - parm.inversion = INVERSION_OFF; + parm_inversion = INVERSION_OFF; break; default: case eDVBFrontendParametersSatellite::Inversion::Unknown: - parm.inversion = INVERSION_AUTO; + 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 } - eDebug("tuning to %d mhz", parm.frequency/1000); +#endif + // FIXME !!! get frequency range from tuner + if ( parm_frequency < 900000 || parm_frequency > 2200000 ) + { + eDebug("%d mhz out of tuner range.. dont tune", parm_frequency/1000); + return -EINVAL; + } + eDebug("tuning to %d mhz", parm_frequency/1000); } return res; } RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm) { - parm.frequency = feparm.frequency * 1000; - parm.u.qam.symbol_rate = feparm.symbol_rate; + parm_frequency = feparm.frequency * 1000; + parm_u_qam_symbol_rate = feparm.symbol_rate; switch (feparm.modulation) { case eDVBFrontendParametersCable::Modulation::QAM16: - parm.u.qam.modulation = QAM_16; + parm_u_qam_modulation = QAM_16; break; case eDVBFrontendParametersCable::Modulation::QAM32: - parm.u.qam.modulation = QAM_32; + parm_u_qam_modulation = QAM_32; break; case eDVBFrontendParametersCable::Modulation::QAM64: - parm.u.qam.modulation = QAM_64; + parm_u_qam_modulation = QAM_64; break; case eDVBFrontendParametersCable::Modulation::QAM128: - parm.u.qam.modulation = QAM_128; + parm_u_qam_modulation = QAM_128; break; case eDVBFrontendParametersCable::Modulation::QAM256: - parm.u.qam.modulation = QAM_256; + parm_u_qam_modulation = QAM_256; break; default: case eDVBFrontendParametersCable::Modulation::Auto: - parm.u.qam.modulation = QAM_AUTO; + parm_u_qam_modulation = QAM_AUTO; break; } switch (feparm.inversion) { case eDVBFrontendParametersCable::Inversion::On: - parm.inversion = INVERSION_ON; + parm_inversion = INVERSION_ON; break; case eDVBFrontendParametersCable::Inversion::Off: - parm.inversion = INVERSION_OFF; + parm_inversion = INVERSION_OFF; break; default: case eDVBFrontendParametersCable::Inversion::Unknown: - parm.inversion = INVERSION_AUTO; + parm_inversion = INVERSION_AUTO; break; } switch (feparm.fec_inner) { case eDVBFrontendParametersCable::FEC::fNone: - parm.u.qam.fec_inner = FEC_NONE; + parm_u_qam_fec_inner = FEC_NONE; break; case eDVBFrontendParametersCable::FEC::f1_2: - parm.u.qam.fec_inner = FEC_1_2; + parm_u_qam_fec_inner = FEC_1_2; break; case eDVBFrontendParametersCable::FEC::f2_3: - parm.u.qam.fec_inner = FEC_2_3; + parm_u_qam_fec_inner = FEC_2_3; break; case eDVBFrontendParametersCable::FEC::f3_4: - parm.u.qam.fec_inner = FEC_3_4; + parm_u_qam_fec_inner = FEC_3_4; break; case eDVBFrontendParametersCable::FEC::f5_6: - parm.u.qam.fec_inner = FEC_5_6; + parm_u_qam_fec_inner = FEC_5_6; break; case eDVBFrontendParametersCable::FEC::f7_8: - parm.u.qam.fec_inner = FEC_7_8; + parm_u_qam_fec_inner = FEC_7_8; break; +#if HAVE_DVB_API_VERSION >= 3 case eDVBFrontendParametersCable::FEC::f8_9: - parm.u.qam.fec_inner = FEC_8_9; + parm_u_qam_fec_inner = FEC_8_9; break; +#endif default: case eDVBFrontendParametersCable::FEC::fAuto: - parm.u.qam.fec_inner = FEC_AUTO; + parm_u_qam_fec_inner = FEC_AUTO; break; } return 0; @@ -1107,131 +1528,148 @@ RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm) RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial &feparm) { - parm.frequency = feparm.frequency; + parm_frequency = feparm.frequency; switch (feparm.bandwidth) { case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: - parm.u.ofdm.bandwidth = BANDWIDTH_8_MHZ; + parm_u_ofdm_bandwidth = BANDWIDTH_8_MHZ; break; case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: - parm.u.ofdm.bandwidth = BANDWIDTH_7_MHZ; + parm_u_ofdm_bandwidth = BANDWIDTH_7_MHZ; break; case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: - parm.u.ofdm.bandwidth = BANDWIDTH_6_MHZ; + parm_u_ofdm_bandwidth = BANDWIDTH_6_MHZ; break; default: case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: - parm.u.ofdm.bandwidth = BANDWIDTH_AUTO; + parm_u_ofdm_bandwidth = BANDWIDTH_AUTO; break; } switch (feparm.code_rate_LP) { - case eDVBFrontendParametersCable::FEC::f1_2: - parm.u.ofdm.code_rate_LP = FEC_1_2; + case eDVBFrontendParametersTerrestrial::FEC::f1_2: + parm_u_ofdm_code_rate_LP = FEC_1_2; break; - case eDVBFrontendParametersCable::FEC::f2_3: - parm.u.ofdm.code_rate_LP = FEC_2_3; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: + parm_u_ofdm_code_rate_LP = FEC_2_3; break; - case eDVBFrontendParametersCable::FEC::f3_4: - parm.u.ofdm.code_rate_LP = FEC_3_4; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: + parm_u_ofdm_code_rate_LP = FEC_3_4; break; - case eDVBFrontendParametersCable::FEC::f5_6: - parm.u.ofdm.code_rate_LP = FEC_5_6; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: + parm_u_ofdm_code_rate_LP = FEC_5_6; break; - case eDVBFrontendParametersCable::FEC::f7_8: - parm.u.ofdm.code_rate_LP = FEC_7_8; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: + parm_u_ofdm_code_rate_LP = FEC_7_8; break; default: - case eDVBFrontendParametersCable::FEC::fAuto: - case eDVBFrontendParametersCable::FEC::fNone: - parm.u.ofdm.code_rate_LP = FEC_AUTO; + case eDVBFrontendParametersTerrestrial::FEC::fAuto: + parm_u_ofdm_code_rate_LP = FEC_AUTO; break; } switch (feparm.code_rate_HP) { - case eDVBFrontendParametersCable::FEC::f1_2: - parm.u.ofdm.code_rate_HP = FEC_1_2; + case eDVBFrontendParametersTerrestrial::FEC::f1_2: + parm_u_ofdm_code_rate_HP = FEC_1_2; break; - case eDVBFrontendParametersCable::FEC::f2_3: - parm.u.ofdm.code_rate_HP = FEC_2_3; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: + parm_u_ofdm_code_rate_HP = FEC_2_3; break; - case eDVBFrontendParametersCable::FEC::f3_4: - parm.u.ofdm.code_rate_HP = FEC_3_4; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: + parm_u_ofdm_code_rate_HP = FEC_3_4; break; - case eDVBFrontendParametersCable::FEC::f5_6: - parm.u.ofdm.code_rate_HP = FEC_5_6; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: + parm_u_ofdm_code_rate_HP = FEC_5_6; break; - case eDVBFrontendParametersCable::FEC::f7_8: - parm.u.ofdm.code_rate_HP = FEC_7_8; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: + parm_u_ofdm_code_rate_HP = FEC_7_8; break; default: - case eDVBFrontendParametersCable::FEC::fAuto: - case eDVBFrontendParametersCable::FEC::fNone: - parm.u.ofdm.code_rate_HP = FEC_AUTO; + case eDVBFrontendParametersTerrestrial::FEC::fAuto: + parm_u_ofdm_code_rate_HP = FEC_AUTO; break; } switch (feparm.modulation) { case eDVBFrontendParametersTerrestrial::Modulation::QPSK: - parm.u.ofdm.constellation = QPSK; + parm_u_ofdm_constellation = QPSK; break; case eDVBFrontendParametersTerrestrial::Modulation::QAM16: - parm.u.ofdm.constellation = QAM_16; + parm_u_ofdm_constellation = QAM_16; + break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM64: + parm_u_ofdm_constellation = QAM_64; break; default: case eDVBFrontendParametersTerrestrial::Modulation::Auto: - parm.u.ofdm.constellation = QAM_AUTO; + parm_u_ofdm_constellation = QAM_AUTO; break; } switch (feparm.transmission_mode) { case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: - parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K; + parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_2K; break; case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: - parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K; + parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_8K; break; default: case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: - parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO; + parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_AUTO; break; } switch (feparm.guard_interval) { case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32: - parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_32; + parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_32; break; case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16: - parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_16; + parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_16; break; case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8: - parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_8; + parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_8; break; case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4: - parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_4; + parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_4; break; default: case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto: - parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO; + parm_u_ofdm_guard_interval = GUARD_INTERVAL_AUTO; break; } switch (feparm.hierarchy) { + case eDVBFrontendParametersTerrestrial::Hierarchy::HNone: + parm_u_ofdm_hierarchy_information = HIERARCHY_NONE; + break; case eDVBFrontendParametersTerrestrial::Hierarchy::H1: - parm.u.ofdm.hierarchy_information = HIERARCHY_1; + parm_u_ofdm_hierarchy_information = HIERARCHY_1; break; case eDVBFrontendParametersTerrestrial::Hierarchy::H2: - parm.u.ofdm.hierarchy_information = HIERARCHY_2; + parm_u_ofdm_hierarchy_information = HIERARCHY_2; break; case eDVBFrontendParametersTerrestrial::Hierarchy::H4: - parm.u.ofdm.hierarchy_information = HIERARCHY_4; + parm_u_ofdm_hierarchy_information = HIERARCHY_4; break; default: case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: - parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO; + parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO; break; } + switch (feparm.inversion) + { + case eDVBFrontendParametersTerrestrial::Inversion::On: + parm_inversion = INVERSION_ON; + break; + case eDVBFrontendParametersTerrestrial::Inversion::Off: + parm_inversion = INVERSION_OFF; + break; + default: + case eDVBFrontendParametersTerrestrial::Inversion::Unknown: + parm_inversion = INVERSION_AUTO; + break; + } return 0; } @@ -1239,13 +1677,20 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) { eDebug("(%d)tune", m_fe); + m_timeout->stop(); + int res=0; - if (m_type == -1) + if (!m_sn) + { + eDebug("no frontend device opened... do not try to tune !!!"); return -ENODEV; + } - feEvent(-1); + if (m_type == -1) + return -ENODEV; + m_sn->stop(); m_sec_sequence.clear(); switch (m_type) @@ -1259,6 +1704,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) return -EINVAL; } res=prepare_sat(feparm); + m_sec->setRotorMoving(false); break; } case feCable: @@ -1268,7 +1714,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) 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) ); + } break; } case feTerrestrial: @@ -1281,7 +1730,22 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) } res=prepare_terrestrial(feparm); 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) ); + else + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) ); + } + else + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) ); m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + } break; } } @@ -1289,7 +1753,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) if (!res) // prepare ok { m_tuneTimer->start(0,true); - m_timeout->stop(); m_sec_sequence.current() = m_sec_sequence.begin(); if (m_state != stateTuning) @@ -1311,7 +1774,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; @@ -1353,7 +1816,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 @@ -1456,7 +1919,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; @@ -1466,7 +1929,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;