X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c4801affcbcbd4304047386dbae16b97b9ccb28c..3375bf50872aa7590af48875aac713cf3b1f646e:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 1067a017..1fa3cafe 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -17,26 +17,82 @@ #define BANDWIDTH_AUTO (BandWidth)3 #define GUARD_INTERVAL_AUTO (GuardInterval)4 #define HIERARCHY_AUTO (Hierarchy)4 -#define parm.frequency parm.Frequency -#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.inversion parm.Inversion +#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 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; @@ -141,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; } @@ -195,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) { @@ -323,7 +402,6 @@ int eDVBFrontend::openFrontend() m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read); CONNECT(m_sn->activated, eDVBFrontend::feEvent); - m_sn->start(); return 0; } @@ -344,8 +422,11 @@ 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; @@ -456,10 +537,396 @@ 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; + 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 @@ -510,6 +977,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: @@ -564,6 +1032,10 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer setFrontend(); ++m_sec_sequence.current(); break; + 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); @@ -608,6 +1080,31 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer ++m_sec_sequence.current(); 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); @@ -714,12 +1211,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; } - m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent } RESULT eDVBFrontend::getFrontendType(int &t) @@ -730,38 +1228,295 @@ 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; + 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; + } + 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; - eDebug("tuning to %d mhz", parm.frequency/1000); + res=prepare_sat(feparm); + m_sec->setRotorMoving(false); break; } case feCable: @@ -769,70 +1524,11 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) eDVBFrontendParametersCable feparm; if (where.getDVBC(feparm)) return -EINVAL; - 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) + res=prepare_cable(feparm); + if (!res) { - 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; - case eDVBFrontendParametersCable::FEC::f8_9: - parm.u.qam.fec_inner = FEC_8_9; - break; - default: - case eDVBFrontendParametersCable::FEC::fAuto: - parm.u.qam.fec_inner = FEC_AUTO; - break; + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } break; } @@ -844,147 +1540,30 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) eDebug("no -T data"); return -EINVAL; } - 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) + res=prepare_terrestrial(feparm); + if (!res) { - case eDVBFrontendParametersCable::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; - break; - case eDVBFrontendParametersCable::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; - break; - case eDVBFrontendParametersCable::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; - break; - } - switch (feparm.code_rate_HP) - { - case eDVBFrontendParametersCable::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; - break; - case eDVBFrontendParametersCable::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; - break; - case eDVBFrontendParametersCable::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; - 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; - 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::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; + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } + break; } } - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); - m_tuneTimer->start(0,true); - m_timeout->stop(); - m_sec_sequence.current() = m_sec_sequence.begin(); - - if (m_state != stateTuning) + if (!res) // prepare ok { - m_tuning = 1; - m_state = stateTuning; - m_stateChanged(this); + 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); + } } - return 0; + return res; } RESULT eDVBFrontend::connectStateChange(const Slot1 &stateChange, ePtr &connection)