X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ac16b9b331350f9b15139394eafe4bf4f44e6151..d250965754894689707739e6d12d7cf6a6f13d5e:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 8d035bfa..a4a94a21 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: @@ -208,102 +211,153 @@ 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_curVoltage(-1) +eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) + :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 { #if HAVE_DVB_API_VERSION < 3 - char sec_filename[128]; + sprintf(m_filename, "/dev/dvb/card%d/frontend%d", adap, fe); + sprintf(m_sec_filename, "/dev/dvb/card%d/sec%d", adap, fe); +#else + sprintf(m_filename, "/dev/dvb/adapter%d/frontend%d", adap, fe); #endif - char filename[128]; + m_timeout = new eTimer(eApp); + CONNECT(m_timeout->timeout, eDVBFrontend::timeout); - int result; + m_tuneTimer = new eTimer(eApp); + CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop); - m_sn = 0; - m_timeout = 0; + int entries = sizeof(m_data) / sizeof(int); + for (int i=0; i= 0) + return -1; // already opened + + m_state=0; + m_curVoltage=voltageOff; + m_tuning=0; #if HAVE_DVB_API_VERSION < 3 - sprintf(sec_filename, "/dev/dvb/card%d/sec%d", adap, fe); - m_secfd = ::open(sec_filename, O_RDWR); + m_secfd = ::open(m_sec_filename, O_RDWR); if (m_secfd < 0) { - eWarning("failed! (%s) %m", sec_filename); - ok = 0; - return; + eWarning("failed! (%s) %m", m_sec_filename); + return -1; } FrontendInfo fe_info; - sprintf(filename, "/dev/dvb/card%d/frontend%d", adap, fe); #else - dvb_frontend_info fe_info; - sprintf(filename, "/dev/dvb/adapter%d/frontend%d", adap, fe); + dvb_frontend_info fe_info; #endif - eDebug("opening frontend."); - m_fd = ::open(filename, O_RDWR|O_NONBLOCK); + eDebug("opening frontend %d", m_fe); + m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK); if (m_fd < 0) { - eWarning("failed! (%s) %m", filename); - ok = 0; - return; - } - - result = ::ioctl(m_fd, FE_GET_INFO, &fe_info); - - if (result < 0) { - eWarning("ioctl FE_GET_INFO failed"); - ::close(m_fd); - m_fd = -1; - ok = 0; - return; + eWarning("failed! (%s) %m", m_filename); +#if HAVE_DVB_API_VERSION < 3 + ::close(m_secfd); + m_secfd=-1; +#endif + return -1; } - switch (fe_info.type) + if (m_type == -1) { - case FE_QPSK: - m_type = feSatellite; - break; - case FE_QAM: - m_type = feCable; - break; - case FE_OFDM: - m_type = feTerrestrial; - break; - default: - eWarning("unknown frontend type."); - ::close(m_fd); - m_fd = -1; - ok = 0; - return; + if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0) + { + eWarning("ioctl FE_GET_INFO failed"); + ::close(m_fd); + m_fd = -1; +#if HAVE_DVB_API_VERSION < 3 + ::close(m_secfd); + m_secfd=-1; +#endif + return -1; + } + + switch (fe_info.type) + { + case FE_QPSK: + m_type = iDVBFrontend::feSatellite; + break; + case FE_QAM: + m_type = iDVBFrontend::feCable; + break; + case FE_OFDM: + m_type = iDVBFrontend::feTerrestrial; + break; + default: + eWarning("unknown frontend type."); + ::close(m_fd); + m_fd = -1; +#if HAVE_DVB_API_VERSION < 3 + ::close(m_secfd); + m_secfd=-1; +#endif + return -1; + } + eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+fe_info.type*10); } - eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+fe_info.type*10); - ok = 1; + + setTone(iDVBFrontend::toneOff); + setVoltage(iDVBFrontend::voltageOff); m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read); CONNECT(m_sn->activated, eDVBFrontend::feEvent); m_sn->start(); - m_timeout = new eTimer(eApp); - CONNECT(m_timeout->timeout, eDVBFrontend::timeout); - - m_tuneTimer = new eTimer(eApp); - CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop); - - int entries = sizeof(m_data) / sizeof(int); - for (int i=0; im_inuse) + { + eDebug("dont close frontend %d until the linked frontend %d is still in use", + m_fe, linked_fe->m_frontend->getID()); + return -1; + } + } + if (m_fd >= 0) + { + eDebug("close frontend %d", m_fe); + setTone(iDVBFrontend::toneOff); + setVoltage(iDVBFrontend::voltageOff); + ::close(m_fd); + m_fd=-1; + } +#if HAVE_DVB_API_VERSION < 3 + if (m_secfd >= 0) + { + ::close(m_secfd); + m_secfd=-1; + } +#endif + delete m_sn; + m_sn=0; - return; + return 0; } eDVBFrontend::~eDVBFrontend() { - if (m_fd >= 0) - ::close(m_fd); - if (m_sn) - delete m_sn; - if (m_timeout) - delete m_timeout; + closeFrontend(); + delete m_timeout; + delete m_tuneTimer; } void eDVBFrontend::feEvent(int w) @@ -376,6 +430,35 @@ void eDVBFrontend::timeout() m_tuning = 0; } +int eDVBFrontend::readFrontendData(int type) +{ + switch(type) + { + case bitErrorRate: + { + uint32_t ber=0; + if (ioctl(m_fd, FE_READ_BER, &ber) < 0 && errno != ERANGE) + eDebug("FE_READ_BER failed (%m)"); + return ber; + } + case signalPower: + { + uint16_t snr=0; + if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE) + eDebug("FE_READ_SNR failed (%m)"); + return snr; + } + case signalQuality: + { + uint16_t strength=0; + if (ioctl(m_fd, FE_READ_SIGNAL_STRENGTH, &strength) < 0 && errno != ERANGE) + eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)"); + return strength; + } + } + return 0; +} + #ifndef FP_IOCTL_GET_ID #define FP_IOCTL_GET_ID 0 #endif @@ -437,10 +520,12 @@ 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::SET_TONE: eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone); setTone(m_sec_sequence.current()++->tone); @@ -511,12 +596,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) @@ -532,7 +617,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer break; case eSecCommand::IF_INPUTPOWER_DELTA_GOTO: { - int idleInputpower = m_idleInputpower[m_curVoltage == iDVBFrontend::voltage13 ? 0 : 1]; + int idleInputpower = m_idleInputpower[ (m_curVoltage&1) ? 0 : 1]; eSecCommand::rotor &cmd = m_sec_sequence.current()->measure; const char *txt = cmd.direction ? "running" : "stopped"; eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d", @@ -580,7 +665,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer void eDVBFrontend::setFrontend() { - eDebug("setting frontend..\n"); + eDebug("setting frontend %d", m_fe); if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1) { perror("FE_SET_FRONTEND failed"); @@ -655,7 +740,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) parm.frequency = feparm.frequency * 1000; parm.u.qam.symbol_rate = feparm.symbol_rate; #endif - fe_modulation_t mod; + fe_modulation_t mod=QAM_AUTO; switch (feparm.modulation) { case eDVBFrontendParametersCable::Modulation::QAM16: @@ -710,7 +795,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) break; } - fe_code_rate_t fec_inner; + fe_code_rate_t fec_inner=FEC_AUTO; switch (feparm.fec_inner) { case eDVBFrontendParametersCable::FEC::fNone: @@ -878,21 +963,39 @@ RESULT eDVBFrontend::connectStateChange(const Slot1 &stateCh RESULT eDVBFrontend::setVoltage(int voltage) { + if (m_type != feSatellite) + return -1; #if HAVE_DVB_API_VERSION < 3 secVoltage vlt; #else + bool increased=false; fe_sec_voltage_t vlt; #endif - m_curVoltage=voltage; switch (voltage) { case voltageOff: + for (int i=0; i < 3; ++i) // reset diseqc + m_data[i]=-1; vlt = SEC_VOLTAGE_OFF; break; + case voltage13_5: +#if HAVE_DVB_API_VERSION < 3 + vlt = SEC_VOLTAGE_13_5; + break; +#else + increased = true; +#endif case voltage13: vlt = SEC_VOLTAGE_13; break; + case voltage18_5: +#if HAVE_DVB_API_VERSION < 3 + vlt = SEC_VOLTAGE_18_5; + break; +#else + increased = true; +#endif case voltage18: vlt = SEC_VOLTAGE_18; break; @@ -902,6 +1005,8 @@ RESULT eDVBFrontend::setVoltage(int voltage) #if HAVE_DVB_API_VERSION < 3 return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt); #else + if (::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0) + perror("FE_ENABLE_HIGH_LNB_VOLTAGE"); return ::ioctl(m_fd, FE_SET_VOLTAGE, vlt); #endif } @@ -914,6 +1019,8 @@ RESULT eDVBFrontend::getState(int &state) RESULT eDVBFrontend::setTone(int t) { + if (m_type != feSatellite) + return -1; #if HAVE_DVB_API_VERSION < 3 secToneMode_t tone; #else @@ -976,6 +1083,19 @@ RESULT eDVBFrontend::sendToneburst(int burst) 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; + if ( burst == eDVBSatelliteDiseqcParameters::A ) + cmd = SEC_MINI_A; + else if ( burst == eDVBSatelliteDiseqcParameters::B ) + cmd = SEC_MINI_B; + else + { + eDebug("unknown toneburst!"); + return -EINVAL; + } + if (::ioctl(m_fd, FE_DISEQC_SEND_BURST, cmd)) + return -EINVAL; #endif return 0; }