X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/00c568ef3ca9e6b4a072f1ff056741c9449aff2d..3375bf50872aa7590af48875aac713cf3b1f646e:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index e6ff5e18..1fa3cafe 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -17,8 +17,8 @@ #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_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 @@ -53,6 +53,46 @@ #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; @@ -157,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; } @@ -361,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; } @@ -382,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; @@ -607,7 +650,7 @@ void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm) case FEC_7_8: tmp = "FEC_7_8"; break; -#ifdef HAVE_DVB_API_VERSION >= 3 +#if HAVE_DVB_API_VERSION >= 3 case FEC_8_9: tmp = "FEC_8_9"; break; @@ -760,6 +803,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; @@ -1165,6 +1211,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"); @@ -1229,6 +1277,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) 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; @@ -1293,7 +1347,7 @@ RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm) case eDVBFrontendParametersCable::FEC::f7_8: parm_u_qam_fec_inner = FEC_7_8; break; -#ifdef HAVE_DVB_API_VERSION >= 3 +#if HAVE_DVB_API_VERSION >= 3 case eDVBFrontendParametersCable::FEC::f8_9: parm_u_qam_fec_inner = FEC_8_9; break; @@ -1417,6 +1471,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; @@ -1438,13 +1495,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) @@ -1458,6 +1516,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) return -EINVAL; } res=prepare_sat(feparm); + m_sec->setRotorMoving(false); break; } case feCable: @@ -1467,7 +1526,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: @@ -1480,7 +1542,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; } } @@ -1488,7 +1553,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)