X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2c69b1c3a49b8b03866894fe3e3f3a4f330f517..a8bb7bff847ea237903e6ac8e5ee0c22b10ef603:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 3e2efbe7..97d8553e 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -53,12 +53,44 @@ #include #include -void eDVBDiseqcCommand::setData(const char *str) +void eDVBDiseqcCommand::setCommandString(const char *str) { - len = strlen(str); - if (len > MAX_DISEQC_LENGTH) - len = MAX_DISEQC_LENGTH; - memcpy(data, str, len); + 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) @@ -165,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; } @@ -259,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; } @@ -369,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; } @@ -390,8 +426,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; @@ -726,6 +765,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm) case QAM_16: tmp = "QAM_16"; break; + case QAM_64: + tmp = "QAM_64"; + break; default: case QAM_AUTO: tmp = "QAM_AUTO"; @@ -768,6 +810,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm) 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; @@ -1173,6 +1218,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"); @@ -1392,6 +1439,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial 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; @@ -1431,6 +1481,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial } 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; @@ -1445,6 +1498,19 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial 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; } @@ -1452,13 +1518,14 @@ 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) @@ -1472,6 +1539,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) return -EINVAL; } res=prepare_sat(feparm); + m_sec->setRotorMoving(false); break; } case feCable: @@ -1481,7 +1549,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: @@ -1494,7 +1565,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) } res=prepare_terrestrial(feparm); if (!res) + { + m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + } break; } } @@ -1502,7 +1576,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)