X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/391f7559e77cf98ea3b5a1fba94a8fa6f4307da8..95039ba3e50f5df85e6e1e2d4108486fd28f2264:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index a26f6bd8..630c0308 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -177,8 +176,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 +210,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); + + m_tuneTimer = new eTimer(eApp); + CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop); + + int entries = sizeof(m_data) / sizeof(int); + for (int i=0; i= 0) + return -1; // already opened - m_sn = 0; - m_timeout = 0; + m_state=0; + 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; + m_data[0] = m_data[1] = m_data[2] = -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) @@ -346,9 +399,7 @@ void eDVBFrontend::feEvent(int w) else { state = stateLostLock; - - if (m_state != stateLostLock) - eDebug("FIXME: we lost lock, so we might have to retune."); + m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc } } if (m_state != state) @@ -361,19 +412,12 @@ void eDVBFrontend::feEvent(int w) void eDVBFrontend::timeout() { - int state; + m_tuning = 0; if (m_state == stateTuning) { - state = stateFailed; - eDebug("DVBFrontend: timeout"); - if (m_state != state) - { - m_state = state; - m_stateChanged(this); - } - m_tuning = 0; - } else - m_tuning = 0; + m_state = stateFailed; + m_stateChanged(this); + } } int eDVBFrontend::readFrontendData(int type) @@ -466,10 +510,28 @@ 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::IF_VOLTAGE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } + case eSecCommand::IF_NOT_VOLTAGE_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + if ( compare.voltage != m_curVoltage && setSecSequencePos(compare.steps) ) + break; + ++m_sec_sequence.current(); + break; + } case eSecCommand::SET_TONE: eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone); setTone(m_sec_sequence.current()++->tone); @@ -491,33 +553,10 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer setFrontend(); ++m_sec_sequence.current(); break; - case eSecCommand::MEASURE_IDLE_INPUTPOWER: - { - int idx = m_sec_sequence.current()++->val; - if ( idx == 0 || idx == 1 ) - { - m_idleInputpower[idx] = readInputpower(); - eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]); - } - else - eDebug("[SEC] idleInputpower measure index(%d) out of bound !!!", idx); - break; - } - case eSecCommand::MEASURE_RUNNING_INPUTPOWER: - m_runningInputpower = readInputpower(); - eDebug("[SEC] runningInputpower is %d", m_runningInputpower); - ++m_sec_sequence.current(); - break; case eSecCommand::SET_TIMEOUT: m_timeoutCount = m_sec_sequence.current()++->val; eDebug("[SEC] set timeout %d", m_timeoutCount); break; - case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: - m_data[5] = m_data[3]; - m_data[6] = m_data[4]; - eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); - ++m_sec_sequence.current(); - break; case eSecCommand::IF_TIMEOUT_GOTO: if (!m_timeoutCount) { @@ -528,40 +567,44 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer else ++m_sec_sequence.current(); break; - case eSecCommand::SET_POWER_LIMITING_MODE: + case eSecCommand::MEASURE_IDLE_INPUTPOWER: { - int fd = m_fe ? - ::open("/dev/i2c/1", O_RDWR) : - ::open("/dev/i2c/0", O_RDWR); - - unsigned char data[2]; - ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1); - if(::read(fd, data, 1) != 1) - eDebug("[SEC] error read lnbp (%m)"); - if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic ) + int idx = m_sec_sequence.current()++->val; + if ( idx == 0 || idx == 1 ) { - data[0] |= 0x90; // enable static current limiting - eDebug("[SEC] set static current limiting"); + m_idleInputpower[idx] = readInputpower(); + eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]); } else + eDebug("[SEC] idleInputpower measure index(%d) out of bound !!!", idx); + break; + } + case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO: + { + eSecCommand::pair &compare = m_sec_sequence.current()->compare; + int idx = compare.voltage; + if ( idx == 0 || idx == 1 ) { - data[0] &= ~0x90; // enable dynamic current limiting - eDebug("[SEC] set dynamic current limiting"); + int idle = readInputpower(); + int diff = abs(idle-m_idleInputpower[idx]); + if ( diff > 0) + { + eDebug("measure idle(%d) was not okay.. (%d - %d = %d) retry", idx, m_idleInputpower[idx], idle, diff); + setSecSequencePos(compare.steps); + break; + } } - if(::write(fd, data, 1) != 1) - eDebug("[SEC] error write lnbp (%m)"); - ::close(fd); ++m_sec_sequence.current(); break; } - case eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO: - if (m_idleInputpower[0] && m_idleInputpower[1] && setSecSequencePos(m_sec_sequence.current()->steps)) - break; + case eSecCommand::MEASURE_RUNNING_INPUTPOWER: + m_runningInputpower = readInputpower(); + eDebug("[SEC] runningInputpower is %d", m_runningInputpower); ++m_sec_sequence.current(); 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", @@ -586,16 +629,66 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer { eDebug("[SEC] rotor not %s... reset counter.. increase timeout", txt); --m_timeoutCount; + if (!m_timeoutCount && m_retryCount > 0) + --m_retryCount; cmd.okcount=0; } ++m_sec_sequence.current(); break; } - case eSecCommand::IF_VOLTAGE_GOTO: + case eSecCommand::IF_ROTORPOS_VALID_GOTO: + if (m_data[5] != -1 && m_data[6] != -1) + setSecSequencePos(m_sec_sequence.current()->steps); + else + ++m_sec_sequence.current(); + break; + case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS: + m_data[5] = m_data[6] = -1; + eDebug("[SEC] invalidate current rotorparams"); + ++m_sec_sequence.current(); + break; + case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: + m_data[5] = m_data[3]; + m_data[6] = m_data[4]; + eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); + ++m_sec_sequence.current(); + break; + case eSecCommand::SET_ROTOR_DISEQC_RETRYS: + m_retryCount = m_sec_sequence.current()++->val; + eDebug("[SEC] set rotor retries %d", m_retryCount); + break; + case eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO: + if (!m_retryCount) + { + eDebug("[SEC] no more rotor retrys"); + setSecSequencePos(m_sec_sequence.current()->steps); + } + else + ++m_sec_sequence.current(); + break; + case eSecCommand::SET_POWER_LIMITING_MODE: { - eSecCommand::pair &compare = m_sec_sequence.current()->compare; - if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) ) - break; + int fd = m_fe ? + ::open("/dev/i2c/1", O_RDWR) : + ::open("/dev/i2c/0", O_RDWR); + + unsigned char data[2]; + ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1); + if(::read(fd, data, 1) != 1) + eDebug("[SEC] error read lnbp (%m)"); + if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic ) + { + data[0] |= 0x80; // enable static current limiting + eDebug("[SEC] set static current limiting"); + } + else + { + data[0] &= ~0x80; // enable dynamic current limiting + eDebug("[SEC] set dynamic current limiting"); + } + if(::write(fd, data, 1) != 1) + eDebug("[SEC] error write lnbp (%m)"); + ::close(fd); ++m_sec_sequence.current(); break; } @@ -609,19 +702,12 @@ 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"); return; } - - if (m_state != stateTuning) - { - m_tuning = 1; - m_state = stateTuning; - m_stateChanged(this); - } m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent } @@ -684,7 +770,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: @@ -739,7 +825,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: @@ -894,8 +980,16 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) 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) + { + m_tuning = 1; + m_state = stateTuning; + m_stateChanged(this); + } + return 0; } @@ -907,21 +1001,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; @@ -931,6 +1043,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 } @@ -943,6 +1057,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 @@ -1005,6 +1121,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; }