X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8a795767b39b7f826e91da10186de07a99bc5f73..63e8b4dec748b32b605fc2bff52fd786e4439077:/lib/dvb/frontend.cpp?ds=sidebyside diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 0bfb1f51..0cb910fb 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -177,8 +177,11 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters diff = 1<<29; else if (sat.polarisation != osat.polarisation) diff = 1<<28; - else + else + { diff = abs(sat.frequency - osat.frequency); + diff += abs(sat.symbol_rate - osat.symbol_rate); + } return 0; } case iDVBFrontend::feCable: @@ -209,7 +212,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_timeout(0), m_tuneTimer(0), m_fd(-1) + :m_type(-1), m_fe(fe), m_fd(-1), m_timeout(0), m_tuneTimer(0) #if HAVE_DVB_API_VERSION < 3 ,m_secfd(-1) #endif @@ -590,12 +593,12 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer eDebug("[SEC] error read lnbp (%m)"); if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic ) { - data[0] |= 0x90; // enable static current limiting + data[0] |= 0x80; // enable static current limiting eDebug("[SEC] set static current limiting"); } else { - data[0] &= ~0x90; // enable dynamic current limiting + data[0] &= ~0x80; // enable dynamic current limiting eDebug("[SEC] set dynamic current limiting"); } if(::write(fd, data, 1) != 1)