X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87b7120717755841c47c5883ae7ee191c2cd3a87..a8bb7bff847ea237903e6ac8e5ee0c22b10ef603:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index b4a870fb..97d8553e 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -18,62 +17,90 @@ #define BANDWIDTH_AUTO (BandWidth)3 #define GUARD_INTERVAL_AUTO (GuardInterval)4 #define HIERARCHY_AUTO (Hierarchy)4 -#define constellation Constellation -#define guard_interval guardInterval -#define hierarchy_information HierarchyInformation -#define code_rate_HP HP_CodeRate -#define code_rate_LP LP_CodeRate +#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 #endif #include #include #include -void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor) +void eDVBDiseqcCommand::setCommandString(const char *str) { - frequency = descriptor.getFrequency() * 10; - symbol_rate = descriptor.getSymbolRate() * 100; - switch (descriptor.getPolarization()) + if (!str) + return; + len=0; + int slen = strlen(str); + if (slen % 2) { - case 0: - polarisation = Polarisation::Horizontal; - break; - case 1: - polarisation = Polarisation::Vertical; - break; - case 2: - polarisation = Polarisation::CircularLeft; - break; - case 3: - polarisation = Polarisation::CircularRight; - break; + eDebug("invalid diseqc command string length (not 2 byte aligned)"); + return; } - switch (descriptor.getFecInner()) + if (slen > MAX_DISEQC_LENGTH*2) { - case 1: - fec = FEC::f1_2; - break; - case 2: - fec = FEC::f2_3; - break; - case 3: - fec = FEC::f3_4; - break; - case 4: - fec = FEC::f5_6; - break; - case 5: - fec = FEC::f7_8; - break; - case 0xF: - fec = FEC::fNone; - break; - default: - fec = FEC::fAuto; - break; + 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; inversion = Inversion::Unknown; orbital_position = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000; orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100; @@ -81,16 +108,55 @@ 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); } void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descriptor) { - eFatal("nyi"); + frequency = descriptor.getFrequency() / 10; + symbol_rate = descriptor.getSymbolRate() * 100; + fec_inner = descriptor.getFecInner(); + if ( fec_inner == 0xF ) + fec_inner = FEC::fNone; + modulation = descriptor.getModulation(); + if ( modulation > 0x5 ) + modulation = Modulation::Auto; + inversion = Inversion::Unknown; + eDebug("Cable freq %d, mod %d, sr %d, fec %d", + frequency, + modulation, symbol_rate, fec_inner); } -void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescriptor &) +void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescriptor &descriptor) { - eFatal("nyi"); + frequency = descriptor.getCentreFrequency() * 10; + bandwidth = descriptor.getBandwidth(); + if ( bandwidth > 2 ) // 5Mhz forced to auto + bandwidth = Bandwidth::BwAuto; + code_rate_HP = descriptor.getCodeRateHpStream(); + if (code_rate_HP > 4) + code_rate_HP = FEC::fAuto; + code_rate_LP = descriptor.getCodeRateLpStream(); + if (code_rate_LP > 4) + code_rate_LP = FEC::fAuto; + transmission_mode = descriptor.getTransmissionMode(); + if (transmission_mode > 2) + transmission_mode = TransmissionMode::TMAuto; + guard_interval = descriptor.getGuardInterval(); + if (guard_interval > 3) + guard_interval = GuardInterval::GI_Auto; + hierarchy = descriptor.getHierarchyInformation()&3; + modulation = descriptor.getConstellation(); + if (modulation > 2) + modulation = Modulation::Auto; + inversion = Inversion::Unknown; + eDebug("Terr freq %d, bw %d, cr_hp %d, cr_lp %d, tm_mode %d, guard %d, hierarchy %d, const %d", + frequency, bandwidth, code_rate_HP, code_rate_LP, transmission_mode, + guard_interval, hierarchy, modulation); } eDVBFrontendParameters::eDVBFrontendParameters(): m_type(-1) @@ -131,9 +197,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; } @@ -185,14 +252,36 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters return 0; } case iDVBFrontend::feCable: + 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) + diff = 1 << 28; + 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); + + return 0; default: return -1; } return 0; } -RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const +RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const { switch (m_type) { @@ -203,7 +292,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; } @@ -245,7 +338,6 @@ int eDVBFrontend::openFrontend() return -1; // already opened m_state=0; - m_curVoltage=voltageOff; m_tuning=0; #if HAVE_DVB_API_VERSION < 3 @@ -314,7 +406,6 @@ int eDVBFrontend::openFrontend() m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read); CONNECT(m_sn->activated, eDVBFrontend::feEvent); - m_sn->start(); return 0; } @@ -335,10 +426,14 @@ int eDVBFrontend::closeFrontend() if (m_fd >= 0) { eDebug("close frontend %d", m_fe); + m_tuneTimer->stop(); setTone(iDVBFrontend::toneOff); 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 HAVE_DVB_API_VERSION < 3 if (m_secfd >= 0) @@ -400,9 +495,7 @@ void eDVBFrontend::feEvent(int w) else { state = stateLostLock; - - if (m_state != stateLostLock) - eDebug("FIXME: we lost lock, so we might have to retune."); + m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc } } if (m_state != state) @@ -415,19 +508,12 @@ void eDVBFrontend::feEvent(int w) void eDVBFrontend::timeout() { - int state; + m_tuning = 0; if (m_state == stateTuning) { - state = stateFailed; - eDebug("DVBFrontend: timeout"); - if (m_state != state) - { - m_state = state; - m_stateChanged(this); - } - m_tuning = 0; - } else - m_tuning = 0; + m_state = stateFailed; + m_stateChanged(this); + } } int eDVBFrontend::readFrontendData(int type) @@ -455,10 +541,399 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)"); return strength; } + case Locked: + { +#if HAVE_DVB_API_VERSION < 3 + FrontendStatus status=0; +#else + fe_status_t status; +#endif + if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE ) + eDebug("FE_READ_STATUS failed (%m)"); + return !!(status&FE_HAS_LOCK); + } + case Synced: + { +#if HAVE_DVB_API_VERSION < 3 + FrontendStatus status=0; +#else + fe_status_t status; +#endif + if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE ) + eDebug("FE_READ_STATUS failed (%m)"); + return !!(status&FE_HAS_SYNC); + } } return 0; } +void PutToDict(PyObject *dict, const char*key, long value) +{ + PyObject *item = PyInt_FromLong(value); + if (item) + { + if (PyDict_SetItemString(dict, key, item)) + eDebug("put %s to dict failed", key); + Py_DECREF(item); + } + else + eDebug("could not create PyObject for %s", key); +} + +void PutToDict(PyObject *dict, const char*key, const char *value) +{ + PyObject *item = PyString_FromString(value); + if (item) + { + if (PyDict_SetItemString(dict, key, item)) + eDebug("put %s to dict failed", key); + Py_DECREF(item); + } + else + eDebug("could not create PyObject for %s", key); +} + +void fillDictWithSatelliteData(PyObject *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); + 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"; + 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; + } + PutToDict(dict, "fec_inner", fec); +} + +void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm) +{ + 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) +{ + 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) +{ + PyObject *ret=PyDict_New(); + + if (ret) + { + bool read=m_fd != -1; + const char *tmp=0; + + PutToDict(ret, "tuner_number", m_fe); + + switch(m_type) + { + case feSatellite: + tmp = "DVB-S"; + break; + case feCable: + tmp = "DVB-C"; + break; + case feTerrestrial: + tmp = "DVB-T"; + 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; + } + return ret; +} + #ifndef FP_IOCTL_GET_ID #define FP_IOCTL_GET_ID 0 #endif @@ -509,6 +984,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer int delay=0; if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() ) { +// eDebug("tuneLoop %d\n", m_sec_sequence.current()->cmd); switch (m_sec_sequence.current()->cmd) { case eSecCommand::SLEEP: @@ -520,10 +996,28 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer ++m_sec_sequence.current(); break; case eSecCommand::SET_VOLTAGE: + { int voltage = m_sec_sequence.current()++->voltage; eDebug("[SEC] setVoltage %d", voltage); setVoltage(voltage); break; + } + case eSecCommand::IF_VOLTAGE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } + case eSecCommand::IF_NOT_VOLTAGE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.voltage != m_curVoltage && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } case eSecCommand::SET_TONE: eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone); setTone(m_sec_sequence.current()++->tone); @@ -545,33 +1039,14 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer setFrontend(); ++m_sec_sequence.current(); break; - case eSecCommand::MEASURE_IDLE_INPUTPOWER: - { - int idx = m_sec_sequence.current()++->val; - if ( idx == 0 || idx == 1 ) - { - m_idleInputpower[idx] = readInputpower(); - eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]); - } - else - eDebug("[SEC] idleInputpower measure index(%d) out of bound !!!", idx); - break; - } - case eSecCommand::MEASURE_RUNNING_INPUTPOWER: - m_runningInputpower = readInputpower(); - eDebug("[SEC] runningInputpower is %d", m_runningInputpower); + case eSecCommand::START_TUNE_TIMEOUT: + m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent ++m_sec_sequence.current(); break; case eSecCommand::SET_TIMEOUT: m_timeoutCount = m_sec_sequence.current()++->val; eDebug("[SEC] set timeout %d", m_timeoutCount); break; - case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: - m_data[5] = m_data[3]; - m_data[6] = m_data[4]; - eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); - ++m_sec_sequence.current(); - break; case eSecCommand::IF_TIMEOUT_GOTO: if (!m_timeoutCount) { @@ -582,35 +1057,64 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer else ++m_sec_sequence.current(); break; - case eSecCommand::SET_POWER_LIMITING_MODE: + case eSecCommand::MEASURE_IDLE_INPUTPOWER: { - int fd = m_fe ? - ::open("/dev/i2c/1", O_RDWR) : - ::open("/dev/i2c/0", O_RDWR); - - unsigned char data[2]; - ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1); - if(::read(fd, data, 1) != 1) - eDebug("[SEC] error read lnbp (%m)"); - if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic ) + int idx = m_sec_sequence.current()++->val; + if ( idx == 0 || idx == 1 ) { - data[0] |= 0x80; // enable static current limiting - eDebug("[SEC] set static current limiting"); + m_idleInputpower[idx] = readInputpower(); + eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]); } else + eDebug("[SEC] idleInputpower measure index(%d) out of bound !!!", idx); + break; + } + case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + int idx = compare.voltage; + if ( idx == 0 || idx == 1 ) { - data[0] &= ~0x80; // enable dynamic current limiting - eDebug("[SEC] set dynamic current limiting"); + int idle = readInputpower(); + int diff = abs(idle-m_idleInputpower[idx]); + if ( diff > 0) + { + eDebug("measure idle(%d) was not okay.. (%d - %d = %d) retry", idx, m_idleInputpower[idx], idle, diff); + setSecSequencePos(compare.steps); + break; + } } - if(::write(fd, data, 1) != 1) - eDebug("[SEC] error write lnbp (%m)"); - ::close(fd); ++m_sec_sequence.current(); break; } - case eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO: - if (m_idleInputpower[0] && m_idleInputpower[1] && setSecSequencePos(m_sec_sequence.current()->steps)) - break; + case eSecCommand::IF_TUNER_LOCKED_GOTO: + { + eSecCommand::rotor &cmd = m_sec_sequence.current()->measure; + if (readFrontendData(Locked)) + { + eDebug("[SEC] locked step %d ok", cmd.okcount); + ++cmd.okcount; + if (cmd.okcount > 12) + { + eDebug("ok > 12 .. goto %d\n",m_sec_sequence.current()->steps); + setSecSequencePos(cmd.steps); + break; + } + } + else + { + eDebug("[SEC] rotor locked step %d failed", cmd.okcount); + --m_timeoutCount; + if (!m_timeoutCount && m_retryCount > 0) + --m_retryCount; + cmd.okcount=0; + } + ++m_sec_sequence.current(); + break; + } + case eSecCommand::MEASURE_RUNNING_INPUTPOWER: + m_runningInputpower = readInputpower(); + eDebug("[SEC] runningInputpower is %d", m_runningInputpower); ++m_sec_sequence.current(); break; case eSecCommand::IF_INPUTPOWER_DELTA_GOTO: @@ -640,16 +1144,66 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer { eDebug("[SEC] rotor not %s... reset counter.. increase timeout", txt); --m_timeoutCount; + if (!m_timeoutCount && m_retryCount > 0) + --m_retryCount; cmd.okcount=0; } ++m_sec_sequence.current(); break; } - case eSecCommand::IF_VOLTAGE_GOTO: + case eSecCommand::IF_ROTORPOS_VALID_GOTO: + if (m_data[5] != -1 && m_data[6] != -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; + 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]; + eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); + ++m_sec_sequence.current(); + break; + case eSecCommand::SET_ROTOR_DISEQC_RETRYS: + m_retryCount = m_sec_sequence.current()++->val; + eDebug("[SEC] set rotor retries %d", m_retryCount); + break; + case eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO: + if (!m_retryCount) + { + eDebug("[SEC] no more rotor retrys"); + setSecSequencePos(m_sec_sequence.current()->steps); + } + else + ++m_sec_sequence.current(); + break; + case eSecCommand::SET_POWER_LIMITING_MODE: { - eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) ) - break; + int fd = m_fe ? + ::open("/dev/i2c/1", O_RDWR) : + ::open("/dev/i2c/0", O_RDWR); + + unsigned char data[2]; + ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1); + if(::read(fd, data, 1) != 1) + eDebug("[SEC] error read lnbp (%m)"); + if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic ) + { + data[0] |= 0x80; // enable static current limiting + eDebug("[SEC] set static current limiting"); + } + else + { + data[0] &= ~0x80; // enable dynamic current limiting + eDebug("[SEC] set dynamic current limiting"); + } + if(::write(fd, data, 1) != 1) + eDebug("[SEC] error write lnbp (%m)"); + ::close(fd); ++m_sec_sequence.current(); break; } @@ -664,19 +1218,13 @@ 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"); return; } - - if (m_state != stateTuning) - { - m_tuning = 1; - m_state = stateTuning; - m_stateChanged(this); - } - m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent } RESULT eDVBFrontend::getFrontendType(int &t) @@ -687,154 +1235,324 @@ RESULT eDVBFrontend::getFrontendType(int &t) return 0; } +RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) +{ + int res; + if (!m_sec) + { + eWarning("no SEC module active!"); + return -ENOENT; + } + res = m_sec->prepare(*this, parm, feparm, 1 << m_fe); + if (!res) + { + parm_u_qpsk_symbol_rate = feparm.symbol_rate; + switch (feparm.inversion) + { + case eDVBFrontendParametersSatellite::Inversion::On: + parm_inversion = INVERSION_ON; + break; + case eDVBFrontendParametersSatellite::Inversion::Off: + parm_inversion = INVERSION_OFF; + break; + default: + case eDVBFrontendParametersSatellite::Inversion::Unknown: + parm_inversion = INVERSION_AUTO; + break; + } + switch (feparm.fec) + { + 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; + } + // 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; + switch (feparm.modulation) + { + case eDVBFrontendParametersCable::Modulation::QAM16: + parm_u_qam_modulation = QAM_16; + break; + case eDVBFrontendParametersCable::Modulation::QAM32: + parm_u_qam_modulation = QAM_32; + break; + case eDVBFrontendParametersCable::Modulation::QAM64: + parm_u_qam_modulation = QAM_64; + break; + case eDVBFrontendParametersCable::Modulation::QAM128: + parm_u_qam_modulation = QAM_128; + break; + case eDVBFrontendParametersCable::Modulation::QAM256: + parm_u_qam_modulation = QAM_256; + break; + default: + case eDVBFrontendParametersCable::Modulation::Auto: + parm_u_qam_modulation = QAM_AUTO; + break; + } + switch (feparm.inversion) + { + case eDVBFrontendParametersCable::Inversion::On: + parm_inversion = INVERSION_ON; + break; + case eDVBFrontendParametersCable::Inversion::Off: + parm_inversion = INVERSION_OFF; + break; + default: + case eDVBFrontendParametersCable::Inversion::Unknown: + parm_inversion = INVERSION_AUTO; + break; + } + switch (feparm.fec_inner) + { + case eDVBFrontendParametersCable::FEC::fNone: + parm_u_qam_fec_inner = FEC_NONE; + break; + case eDVBFrontendParametersCable::FEC::f1_2: + parm_u_qam_fec_inner = FEC_1_2; + break; + case eDVBFrontendParametersCable::FEC::f2_3: + parm_u_qam_fec_inner = FEC_2_3; + break; + case eDVBFrontendParametersCable::FEC::f3_4: + parm_u_qam_fec_inner = FEC_3_4; + break; + case eDVBFrontendParametersCable::FEC::f5_6: + parm_u_qam_fec_inner = FEC_5_6; + break; + case eDVBFrontendParametersCable::FEC::f7_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; + break; +#endif + default: + case eDVBFrontendParametersCable::FEC::fAuto: + parm_u_qam_fec_inner = FEC_AUTO; + break; + } + return 0; +} + +RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial &feparm) +{ + parm_frequency = feparm.frequency; + + switch (feparm.bandwidth) + { + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: + parm_u_ofdm_bandwidth = BANDWIDTH_8_MHZ; + break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: + parm_u_ofdm_bandwidth = BANDWIDTH_7_MHZ; + break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: + parm_u_ofdm_bandwidth = BANDWIDTH_6_MHZ; + break; + default: + case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: + parm_u_ofdm_bandwidth = BANDWIDTH_AUTO; + break; + } + switch (feparm.code_rate_LP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: + parm_u_ofdm_code_rate_LP = FEC_1_2; + break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: + parm_u_ofdm_code_rate_LP = FEC_2_3; + break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: + parm_u_ofdm_code_rate_LP = FEC_3_4; + break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: + parm_u_ofdm_code_rate_LP = FEC_5_6; + break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: + parm_u_ofdm_code_rate_LP = FEC_7_8; + break; + default: + case eDVBFrontendParametersTerrestrial::FEC::fAuto: + parm_u_ofdm_code_rate_LP = FEC_AUTO; + break; + } + switch (feparm.code_rate_HP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: + parm_u_ofdm_code_rate_HP = FEC_1_2; + break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: + parm_u_ofdm_code_rate_HP = FEC_2_3; + break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: + parm_u_ofdm_code_rate_HP = FEC_3_4; + break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: + parm_u_ofdm_code_rate_HP = FEC_5_6; + break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: + parm_u_ofdm_code_rate_HP = FEC_7_8; + break; + default: + 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; + break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM16: + 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; + break; + } + switch (feparm.transmission_mode) + { + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: + parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_2K; + break; + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: + parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_8K; + break; + default: + case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: + 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; + break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_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; + break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_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; + 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; + break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H2: + parm_u_ofdm_hierarchy_information = HIERARCHY_2; + break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H4: + parm_u_ofdm_hierarchy_information = HIERARCHY_4; + break; + default: + case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: + 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; +} + RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) { eDebug("(%d)tune", m_fe); + m_timeout->stop(); + + int res=0; + if (m_type == -1) return -ENODEV; - feEvent(-1); - + m_sn->stop(); m_sec_sequence.clear(); switch (m_type) { case feSatellite: { - int res; eDVBFrontendParametersSatellite feparm; if (where.getDVBS(feparm)) { eDebug("no dvbs data!"); return -EINVAL; } - if (!m_sec) - { - eWarning("no SEC module active!"); - return -ENOENT; - } - - res = m_sec->prepare(*this, parm, feparm, 1 << m_fe); - if (res) - return res; -#if HAVE_DVB_API_VERSION < 3 - eDebug("tuning to %d mhz", parm.Frequency/1000); -#else - eDebug("tuning to %d mhz", parm.frequency/1000); -#endif + res=prepare_sat(feparm); + m_sec->setRotorMoving(false); break; } case feCable: { -#if HAVE_DVB_API_VERSION >= 3 eDVBFrontendParametersCable feparm; if (where.getDVBC(feparm)) return -EINVAL; -#if HAVE_DVB_API_VERSION < 3 - parm.Frequency = feparm.frequency * 1000; - parm.u.qam.SymbolRate = feparm.symbol_rate; -#else - parm.frequency = feparm.frequency * 1000; - parm.u.qam.symbol_rate = feparm.symbol_rate; -#endif - fe_modulation_t mod=QAM_AUTO; - switch (feparm.modulation) + res=prepare_cable(feparm); + if (!res) { - case eDVBFrontendParametersCable::Modulation::QAM16: - mod = QAM_16; - break; - case eDVBFrontendParametersCable::Modulation::QAM32: - mod = QAM_32; - break; - case eDVBFrontendParametersCable::Modulation::QAM64: - mod = QAM_64; - break; - case eDVBFrontendParametersCable::Modulation::QAM128: - mod = QAM_128; - break; - case eDVBFrontendParametersCable::Modulation::QAM256: - mod = QAM_256; - break; - case eDVBFrontendParametersCable::Modulation::Auto: - mod = QAM_AUTO; - break; + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } -#if HAVE_DVB_API_VERSION < 3 - parm.u.qam.QAM = mod; -#else - parm.u.qam.modulation = mod; -#endif - switch (feparm.inversion) - { - case eDVBFrontendParametersCable::Inversion::On: - #if HAVE_DVB_API_VERSION < 3 - parm.Inversion = - #else - parm.inversion = - #endif - INVERSION_ON; - break; - case eDVBFrontendParametersCable::Inversion::Off: - #if HAVE_DVB_API_VERSION < 3 - parm.Inversion = - #else - parm.inversion = - #endif - INVERSION_OFF; - break; - case eDVBFrontendParametersCable::Inversion::Unknown: - #if HAVE_DVB_API_VERSION < 3 - parm.Inversion = - #else - parm.inversion = - #endif - INVERSION_AUTO; - break; - } - - fe_code_rate_t fec_inner=FEC_AUTO; - switch (feparm.fec_inner) - { - case eDVBFrontendParametersCable::FEC::fNone: - fec_inner = FEC_NONE; - break; - case eDVBFrontendParametersCable::FEC::f1_2: - fec_inner = FEC_1_2; - break; - case eDVBFrontendParametersCable::FEC::f2_3: - fec_inner = FEC_2_3; - break; - case eDVBFrontendParametersCable::FEC::f3_4: - fec_inner = FEC_3_4; - break; - case eDVBFrontendParametersCable::FEC::f4_5: - fec_inner = FEC_4_5; - break; - case eDVBFrontendParametersCable::FEC::f5_6: - fec_inner = FEC_5_6; - break; - case eDVBFrontendParametersCable::FEC::f6_7: - fec_inner = FEC_6_7; - break; - case eDVBFrontendParametersCable::FEC::f7_8: - fec_inner = FEC_7_8; - break; - case eDVBFrontendParametersCable::FEC::f8_9: - fec_inner = FEC_8_9; - break; - case eDVBFrontendParametersCable::FEC::fAuto: - fec_inner = FEC_AUTO; - break; - } -#if HAVE_DVB_API_VERSION < 3 - parm.u.qam.FEC_inner = fec_inner; -#else - parm.u.qam.fec_inner = fec_inner; -#endif -#else - eFatal("Old API not fully supported"); -#endif // old api break; } case feTerrestrial: @@ -845,112 +1563,30 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) eDebug("no -T data"); return -EINVAL; } -#if HAVE_DVB_API_VERSION < 3 - parm.Frequency = feparm.frequency; -#else - parm.frequency = feparm.frequency; -#endif - - switch (feparm.bandwidth) - { - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.bandWidth = -#else - parm.u.ofdm.bandwidth = -#endif - BANDWIDTH_8_MHZ; - break; - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.bandWidth = -#else - parm.u.ofdm.bandwidth = -#endif - BANDWIDTH_7_MHZ; - break; - case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.bandWidth = -#else - parm.u.ofdm.bandwidth = -#endif - BANDWIDTH_6_MHZ; - break; - case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.bandWidth = -#else - parm.u.ofdm.bandwidth = -#endif - BANDWIDTH_AUTO; - break; - default: - eWarning("invalid OFDM bandwith"); - return -EINVAL; - } - - parm.u.ofdm.code_rate_HP = FEC_AUTO; - parm.u.ofdm.code_rate_LP = FEC_AUTO; - - switch (feparm.modulation) - { - case eDVBFrontendParametersTerrestrial::Modulation::QPSK: - parm.u.ofdm.constellation = QPSK; - break; - case eDVBFrontendParametersTerrestrial::Modulation::QAM16: - parm.u.ofdm.constellation = QAM_16; - break; - case eDVBFrontendParametersTerrestrial::Modulation::Auto: - parm.u.ofdm.constellation = QAM_AUTO; - break; - } - - switch (feparm.transmission_mode) + res=prepare_terrestrial(feparm); + if (!res) { - case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.TransmissionMode = -#else - parm.u.ofdm.transmission_mode = -#endif - TRANSMISSION_MODE_2K; - break; - case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.TransmissionMode = -#else - parm.u.ofdm.transmission_mode = -#endif - TRANSMISSION_MODE_8K; - break; - case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: -#if HAVE_DVB_API_VERSION < 3 - parm.u.ofdm.TransmissionMode = -#else - parm.u.ofdm.transmission_mode = -#endif - TRANSMISSION_MODE_AUTO; - break; + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } - - parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO; - parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO; -#if HAVE_DVB_API_VERSION < 3 - parm.Inversion = -#else - parm.inversion = -#endif - INVERSION_AUTO; break; } } - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); - m_tuneTimer->start(0,true); - m_sec_sequence.current() = m_sec_sequence.begin(); + if (!res) // prepare ok + { + m_tuneTimer->start(0,true); + m_sec_sequence.current() = m_sec_sequence.begin(); - return 0; + if (m_state != stateTuning) + { + m_tuning = 1; + m_state = stateTuning; + m_stateChanged(this); + } + } + + return res; } RESULT eDVBFrontend::connectStateChange(const Slot1 &stateChange, ePtr &connection) @@ -1075,23 +1711,17 @@ RESULT eDVBFrontend::sendToneburst(int burst) { #if HAVE_DVB_API_VERSION < 3 secMiniCmd cmd = SEC_MINI_NONE; - if ( burst == eDVBSatelliteDiseqcParameters::A ) - cmd = SEC_MINI_A; - else if ( burst == eDVBSatelliteDiseqcParameters::B ) - cmd = SEC_MINI_B; - if (::ioctl(m_secfd, SEC_DISEQC_SEND_BURST, cmd)) - return -EINVAL; #else fe_sec_mini_cmd_t cmd = SEC_MINI_A; +#endif if ( burst == eDVBSatelliteDiseqcParameters::A ) cmd = SEC_MINI_A; else if ( burst == eDVBSatelliteDiseqcParameters::B ) cmd = SEC_MINI_B; - else - { - eDebug("unknown toneburst!"); +#if HAVE_DVB_API_VERSION < 3 + if (::ioctl(m_secfd, SEC_DISEQC_SEND_BURST, cmd)) return -EINVAL; - } +#else if (::ioctl(m_fd, FE_DISEQC_SEND_BURST, cmd)) return -EINVAL; #endif