X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c1d83d373b4a0737da668945d1ddb3278b6c3b7..479df2313449286767814bc0c89624fdd45d2a2d:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 1136d9dc..b8debd81 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -6,6 +6,10 @@ #include #include +#ifndef I2C_SLAVE_FORCE +#define I2C_SLAVE_FORCE 0x0706 +#endif + #if HAVE_DVB_API_VERSION < 3 #include #include @@ -23,9 +27,9 @@ #include #endif -#include -#include -#include +#include +#include +#include void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor) { @@ -204,7 +208,7 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const DEFINE_REF(eDVBFrontend); -eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1) +eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_curVoltage(-1) { #if HAVE_DVB_API_VERSION < 3 char sec_filename[128]; @@ -337,7 +341,12 @@ void eDVBFrontend::feEvent(int w) if (m_tuning) state = stateTuning; else - state = stateFailed; + { + state = stateLostLock; + + if (m_state != stateLostLock) + eDebug("FIXME: we lost lock, so we might have to retune."); + } } if (m_state != state) { @@ -359,10 +368,67 @@ void eDVBFrontend::timeout() m_state = state; m_stateChanged(this); } + m_tuning = 0; } else m_tuning = 0; } +#ifndef FP_IOCTL_GET_ID +#define FP_IOCTL_GET_ID 0 +#endif +int eDVBFrontend::readInputpower() +{ + int power=0; +// if ( eSystemInfo::getInstance()->canMeasureLNBCurrent() ) + { +// switch ( eSystemInfo::getInstance()->getHwType() ) + { +// case eSystemInfo::DM7000: +// case eSystemInfo::DM7020: + { + // open front prozessor + int fp=::open("/dev/dbox/fp0", O_RDWR); + if (fp < 0) + { + eDebug("couldn't open fp"); + return -1; + } + static bool old_fp = (::ioctl(fp, FP_IOCTL_GET_ID) < 0); + if ( ioctl( fp, old_fp ? 9 : 0x100, &power ) < 0 ) + { + eDebug("FP_IOCTL_GET_LNB_CURRENT failed (%m)"); + return -1; + } + ::close(fp); +// break; + } +// default: +// eDebug("Inputpower read for platform %d not yet implemented", eSystemInfo::getInstance()->getHwType()); + } + } + return power; +} + +bool eDVBFrontend::setSecSequencePos(int steps) +{ + eDebug("set sequence pos %d", steps); + if (!steps) + return false; + while( steps > 0 ) + { + if (m_sec_sequence.current() != m_sec_sequence.end()) + ++m_sec_sequence.current(); + --steps; + } + while( steps < 0 ) + { + if (m_sec_sequence.current() != m_sec_sequence.begin() && m_sec_sequence.current() != m_sec_sequence.end()) + --m_sec_sequence.current(); + ++steps; + } + return true; +} + void eDVBFrontend::tuneLoop() // called by m_tuneTimer { int delay=0; @@ -371,29 +437,146 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer switch (m_sec_sequence.current()->cmd) { case eSecCommand::SLEEP: - delay = m_sec_sequence.current()->msec; + delay = m_sec_sequence.current()++->msec; + eDebug("[SEC] sleep %dms", delay); + break; + case eSecCommand::GOTO: + if ( !setSecSequencePos(m_sec_sequence.current()->steps) ) + ++m_sec_sequence.current(); break; case eSecCommand::SET_VOLTAGE: - setVoltage(m_sec_sequence.current()->voltage); + int voltage = m_sec_sequence.current()++->voltage; + eDebug("[SEC] setVoltage %d", voltage); + setVoltage(voltage); break; case eSecCommand::SET_TONE: - setTone(m_sec_sequence.current()->tone); + eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone); + setTone(m_sec_sequence.current()++->tone); break; case eSecCommand::SEND_DISEQC: sendDiseqc(m_sec_sequence.current()->diseqc); + eDebugNoNewLine("[SEC] sendDiseqc: "); + for (int i=0; i < m_sec_sequence.current()->diseqc.len; ++i) + eDebugNoNewLine("%02x", m_sec_sequence.current()->diseqc.data[i]); + eDebug(""); + ++m_sec_sequence.current(); break; case eSecCommand::SEND_TONEBURST: - sendToneburst(m_sec_sequence.current()->toneburst); + eDebug("[SEC] sendToneburst: %d", m_sec_sequence.current()->toneburst); + sendToneburst(m_sec_sequence.current()++->toneburst); break; case eSecCommand::SET_FRONTEND: + eDebug("[SEC] setFrontend"); 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::IF_LOCK_GOTO: - case eSecCommand::IF_NOT_LOCK_GOTO: + 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) + { + eDebug("[SEC] rotor timout"); + setSecSequencePos(m_sec_sequence.current()->steps); + } + else + ++m_sec_sequence.current(); + break; + case eSecCommand::SET_POWER_LIMITING_MODE: + { + int fd=::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] |= 0x90; // enable static current limiting + eDebug("[SEC] set static current limiting"); + } + else + { + data[0] &= ~0x90; // 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; + } + case eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO: + if (m_idleInputpower[0] && m_idleInputpower[1] && setSecSequencePos(m_sec_sequence.current()->steps)) + break; + ++m_sec_sequence.current(); + break; + case eSecCommand::IF_INPUTPOWER_DELTA_GOTO: + { + int idleInputpower = m_idleInputpower[m_curVoltage == iDVBFrontend::voltage13 ? 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", + txt, + m_runningInputpower, + idleInputpower, + cmd.deltaA); + if ( (cmd.direction && abs(m_runningInputpower - idleInputpower) >= cmd.deltaA) + || (!cmd.direction && abs(m_runningInputpower - idleInputpower) <= cmd.deltaA) ) + { + ++cmd.okcount; + eDebug("[SEC] rotor %s step %d ok", txt, cmd.okcount); + if ( cmd.okcount > 6 ) + { + eDebug("[SEC] rotor is %s", txt); + if (setSecSequencePos(cmd.steps)) + break; + } + } + else + { + eDebug("[SEC] rotor not %s... reset counter.. increase timeout", txt); + --m_timeoutCount; + cmd.okcount=0; + } + ++m_sec_sequence.current(); + 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; + } default: - eDebug("unhandled sec command"); + ++m_sec_sequence.current(); + eDebug("[SEC] unhandled sec command"); } - m_sec_sequence.current()++; m_tuneTimer->start(delay,true); } } @@ -433,8 +616,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) m_sec_sequence.clear(); - eDebug("eDVBFrontend::tune. type: %d", m_type); - switch (m_type) { case feSatellite: @@ -578,7 +759,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) } } - m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 0) ); + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); m_tuneTimer->start(0,true); m_sec_sequence.current() = m_sec_sequence.begin(); @@ -599,6 +780,7 @@ RESULT eDVBFrontend::setVoltage(int voltage) fe_sec_voltage_t vlt; #endif + m_curVoltage=voltage; switch (voltage) { case voltageOff: @@ -658,8 +840,6 @@ RESULT eDVBFrontend::setTone(int t) RESULT eDVBFrontend::sendDiseqc(const eDVBDiseqcCommand &diseqc) { - eDebug("send %02x %02x %02x %02x", - diseqc.data[0], diseqc.data[1], diseqc.data[2], diseqc.data[3]); #if HAVE_DVB_API_VERSION < 3 struct secCommand cmd; cmd.type = SEC_CMDTYPE_DISEQC_RAW; @@ -710,7 +890,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list) RESULT eDVBFrontend::getData(int num, int &data) { - if ( num < 5 ) + if ( num < 7 ) { data = m_data[num]; return 0; @@ -720,7 +900,7 @@ RESULT eDVBFrontend::getData(int num, int &data) RESULT eDVBFrontend::setData(int num, int val) { - if ( num < 5 ) + if ( num < 7 ) { m_data[num] = val; return 0;