X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/02da1f586ef7945fef385e6d4743ef53441bc2fa..00ae28e6c92cdac5687c82bc9aa3d2ca999b354f:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 8948f194..75824f03 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -5,11 +6,30 @@ #include #include +#ifndef I2C_SLAVE_FORCE +#define I2C_SLAVE_FORCE 0x0706 +#endif + +#if HAVE_DVB_API_VERSION < 3 +#include +#include +#define QAM_AUTO (Modulation)6 +#define TRANSMISSION_MODE_AUTO (TransmitMode)2 +#define BANDWIDTH_AUTO (BandWidth)3 +#define GUARD_INTERVAL_AUTO (GuardInterval)4 +#define HIERARCHY_AUTO (Hierarchy)4 +#define constellation Constellation +#define guard_interval guardInterval +#define hierarchy_information HierarchyInformation +#define code_rate_HP HP_CodeRate +#define code_rate_LP LP_CodeRate +#else #include +#endif -#include -#include -#include +#include +#include +#include void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor) { @@ -73,7 +93,7 @@ void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescr eFatal("nyi"); } -eDVBFrontendParameters::eDVBFrontendParameters(): ref(0), m_type(-1) +eDVBFrontendParameters::eDVBFrontendParameters(): m_type(-1) { } @@ -111,21 +131,21 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con return 0; } -RESULT eDVBFrontendParameters::setDVBS(eDVBFrontendParametersSatellite &p) +RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p) { sat = p; m_type = iDVBFrontend::feSatellite; return 0; } -RESULT eDVBFrontendParameters::setDVBC(eDVBFrontendParametersCable &p) +RESULT eDVBFrontendParameters::setDVBC(const eDVBFrontendParametersCable &p) { cable = p; m_type = iDVBFrontend::feCable; return 0; } -RESULT eDVBFrontendParameters::setDVBT(eDVBFrontendParametersTerrestrial &p) +RESULT eDVBFrontendParameters::setDVBT(const eDVBFrontendParametersTerrestrial &p) { terrestrial = p; m_type = iDVBFrontend::feTerrestrial; @@ -188,16 +208,36 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const DEFINE_REF(eDVBFrontend); -eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): ref(0), m_type(-1) +eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_curVoltage(-1) { +#if HAVE_DVB_API_VERSION < 3 + char sec_filename[128]; +#endif char filename[128]; + int result; - dvb_frontend_info fe_info; - + m_sn = 0; m_timeout = 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); + if (m_secfd < 0) + { + eWarning("failed! (%s) %m", sec_filename); + ok = 0; + return; + } + else + eDebug("m_secfd is %d", m_secfd); + + 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); +#endif eDebug("opening frontend."); m_fd = ::open(filename, O_RDWR|O_NONBLOCK); if (m_fd < 0) @@ -206,7 +246,7 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): ref(0), m_type(-1) ok = 0; return; } - + result = ::ioctl(m_fd, FE_GET_INFO, &fe_info); if (result < 0) { @@ -235,16 +275,21 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): ref(0), m_type(-1) ok = 0; return; } - eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+feSatellite*9); + eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+fe_info.type*9); ok = 1; 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); + + memset(m_data, 0xFFFF, sizeof(m_data)); + return; } @@ -262,7 +307,11 @@ void eDVBFrontend::feEvent(int w) { while (1) { +#if HAVE_DVB_API_VERSION < 3 + FrontendEvent event; +#else dvb_frontend_event event; +#endif int res; int state; res = ::ioctl(m_fd, FE_GET_EVENT, &event); @@ -278,9 +327,13 @@ void eDVBFrontend::feEvent(int w) if (w < 0) continue; - + +#if HAVE_DVB_API_VERSION < 3 + if (event.type == FE_COMPLETION_EV) +#else eDebug("fe event: status %x, inversion %s", event.status, (event.parameters.inversion == INVERSION_ON) ? "on" : "off"); if (event.status & FE_HAS_LOCK) +#endif { state = stateLock; } else @@ -288,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) { @@ -310,10 +368,237 @@ 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; + if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() ) + { + switch (m_sec_sequence.current()->cmd) + { + case eSecCommand::SLEEP: + 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: + 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); + 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: + 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::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: + ++m_sec_sequence.current(); + eDebug("[SEC] unhandled sec command"); + } + m_tuneTimer->start(delay,true); + } +} + +void eDVBFrontend::setFrontend() +{ + eDebug("setting frontend..\n"); + 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 +} + RESULT eDVBFrontend::getFrontendType(int &t) { if (m_type == -1) @@ -327,10 +612,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) if (m_type == -1) return -ENODEV; - dvb_frontend_parameters parm; - feEvent(-1); - + + m_sec_sequence.clear(); + switch (m_type) { case feSatellite: @@ -348,11 +633,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) return -ENOENT; } - res = m_sec->prepare(*this, parm, feparm); + res = m_sec->prepare(*this, parm, feparm, 1 << m_fe); if (res) return res; - +#if HAVE_DVB_API_VERSION < 3 + eDebug("tuning to %d mhz", parm.Frequency/1000); +#else eDebug("tuning to %d mhz", parm.frequency/1000); +#endif break; } case feCable: @@ -360,31 +648,209 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) eDVBFrontendParametersCable feparm; if (where.getDVBC(feparm)) return -EINVAL; - eFatal("cable tuning nyi"); +#if HAVE_DVB_API_VERSION < 3 + parm.Frequency = feparm.frequency; +#else + parm.frequency = feparm.frequency; +#endif + + parm.u.qam.symbol_rate = feparm.symbol_rate; + + switch (feparm.modulation) + { + case eDVBFrontendParametersCable::Modulation::QAM16: + parm.u.qam.modulation = QAM_16; + break; + case eDVBFrontendParametersCable::Modulation::QAM32: + parm.u.qam.modulation = QAM_32; + break; + case eDVBFrontendParametersCable::Modulation::QAM64: + parm.u.qam.modulation = QAM_64; + break; + case eDVBFrontendParametersCable::Modulation::QAM128: + parm.u.qam.modulation = QAM_128; + break; + case eDVBFrontendParametersCable::Modulation::QAM256: + parm.u.qam.modulation = QAM_256; + break; + case eDVBFrontendParametersCable::Modulation::Auto: + parm.u.qam.modulation = QAM_AUTO; + break; + } + switch (feparm.modulation) + { + case eDVBFrontendParametersCable::Inversion::On: + #if HAVE_DVB_API_VERSION < 3 + parm.Inversion = + #else + parm.inversion = + #endif + INVERSION_ON; + break; + case eDVBFrontendParametersCable::Inversion::Off: + #if HAVE_DVB_API_VERSION < 3 + parm.Inversion = + #else + parm.inversion = + #endif + INVERSION_OFF; + break; + case eDVBFrontendParametersCable::Inversion::Unknown: + #if HAVE_DVB_API_VERSION < 3 + parm.Inversion = + #else + parm.inversion = + #endif + INVERSION_AUTO; + break; + } + switch (feparm.fec_inner) + { + case eDVBFrontendParametersCable::FEC::fNone: + parm.u.qam.fec_inner = FEC_NONE; + break; + case eDVBFrontendParametersCable::FEC::f1_2: + parm.u.qam.fec_inner = FEC_1_2; + break; + case eDVBFrontendParametersCable::FEC::f2_3: + parm.u.qam.fec_inner = FEC_2_3; + break; + case eDVBFrontendParametersCable::FEC::f3_4: + parm.u.qam.fec_inner = FEC_3_4; + break; + case eDVBFrontendParametersCable::FEC::f4_5: + parm.u.qam.fec_inner = FEC_4_5; + break; + case eDVBFrontendParametersCable::FEC::f5_6: + parm.u.qam.fec_inner = FEC_5_6; + break; + case eDVBFrontendParametersCable::FEC::f6_7: + parm.u.qam.fec_inner = FEC_6_7; + break; + case eDVBFrontendParametersCable::FEC::f7_8: + parm.u.qam.fec_inner = FEC_7_8; + break; + case eDVBFrontendParametersCable::FEC::f8_9: + parm.u.qam.fec_inner = FEC_8_9; + break; + case eDVBFrontendParametersCable::FEC::fAuto: + parm.u.qam.fec_inner = FEC_AUTO; + break; + } + break; } case feTerrestrial: { eDVBFrontendParametersTerrestrial feparm; if (where.getDVBT(feparm)) + { + eDebug("no -T data"); return -EINVAL; - eFatal("terrestrial tuning nyi"); - } - } - - if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1) - { - perror("FE_SET_FRONTEND failed"); - return errno; + } +#if HAVE_DVB_API_VERSION < 3 + parm.Frequency = feparm.frequency; +#else + parm.frequency = feparm.frequency; +#endif + + switch (feparm.bandwidth) + { + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.bandWidth = +#else + parm.u.ofdm.bandwidth = +#endif + BANDWIDTH_8_MHZ; + break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.bandWidth = +#else + parm.u.ofdm.bandwidth = +#endif + BANDWIDTH_7_MHZ; + break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.bandWidth = +#else + parm.u.ofdm.bandwidth = +#endif + BANDWIDTH_6_MHZ; + break; + case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.bandWidth = +#else + parm.u.ofdm.bandwidth = +#endif + BANDWIDTH_AUTO; + break; + default: + eWarning("invalid OFDM bandwith"); + return -EINVAL; + } + + parm.u.ofdm.code_rate_HP = FEC_AUTO; + parm.u.ofdm.code_rate_LP = FEC_AUTO; + + switch (feparm.modulation) + { + case eDVBFrontendParametersTerrestrial::Modulation::QPSK: + parm.u.ofdm.constellation = QPSK; + break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM16: + parm.u.ofdm.constellation = QAM_16; + break; + case eDVBFrontendParametersTerrestrial::Modulation::Auto: + parm.u.ofdm.constellation = QAM_AUTO; + break; + } + + switch (feparm.transmission_mode) + { + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.TransmissionMode = +#else + parm.u.ofdm.transmission_mode = +#endif + TRANSMISSION_MODE_2K; + break; + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.TransmissionMode = +#else + parm.u.ofdm.transmission_mode = +#endif + TRANSMISSION_MODE_8K; + break; + case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: +#if HAVE_DVB_API_VERSION < 3 + parm.u.ofdm.TransmissionMode = +#else + parm.u.ofdm.transmission_mode = +#endif + TRANSMISSION_MODE_AUTO; + break; + } + + parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO; + parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO; +#if HAVE_DVB_API_VERSION < 3 + parm.Inversion = +#else + parm.inversion = +#endif + INVERSION_AUTO; + break; } - - if (m_state != stateTuning) - { - m_tuning = 1; - m_state = stateTuning; - m_stateChanged(this); } - - m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent + + m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + m_tuneTimer->start(0,true); + m_sec_sequence.current() = m_sec_sequence.begin(); return 0; } @@ -397,8 +863,13 @@ RESULT eDVBFrontend::connectStateChange(const Slot1 &stateCh RESULT eDVBFrontend::setVoltage(int voltage) { +#if HAVE_DVB_API_VERSION < 3 + secVoltage vlt; +#else fe_sec_voltage_t vlt; - +#endif + + m_curVoltage=voltage; switch (voltage) { case voltageOff: @@ -413,8 +884,11 @@ RESULT eDVBFrontend::setVoltage(int voltage) default: return -ENODEV; } - +#if HAVE_DVB_API_VERSION < 3 + return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt); +#else return ::ioctl(m_fd, FE_SET_VOLTAGE, vlt); +#endif } RESULT eDVBFrontend::getState(int &state) @@ -425,8 +899,12 @@ RESULT eDVBFrontend::getState(int &state) RESULT eDVBFrontend::setTone(int t) { +#if HAVE_DVB_API_VERSION < 3 + secToneMode_t tone; +#else fe_sec_tone_mode_t tone; - +#endif + switch (t) { case toneOn: @@ -438,23 +916,52 @@ RESULT eDVBFrontend::setTone(int t) default: return -ENODEV; } - - return ::ioctl(m_fd, FE_SET_TONE, tone); +#if HAVE_DVB_API_VERSION < 3 + return ::ioctl(m_secfd, SEC_SET_TONE, tone); +#else + return ::ioctl(m_fd, FE_SET_TONE, tone); +#endif } +#if HAVE_DVB_API_VERSION < 3 && !defined(SEC_DISEQC_SEND_MASTER_CMD) + #define SEC_DISEQC_SEND_MASTER_CMD _IOW('o', 97, struct secCommand *) +#endif + RESULT eDVBFrontend::sendDiseqc(const eDVBDiseqcCommand &diseqc) { +#if HAVE_DVB_API_VERSION < 3 + struct secCommand cmd; + cmd.type = SEC_CMDTYPE_DISEQC_RAW; + cmd.u.diseqc.cmdtype = diseqc.data[0]; + cmd.u.diseqc.addr = diseqc.data[1]; + cmd.u.diseqc.cmd = diseqc.data[2]; + cmd.u.diseqc.numParams = diseqc.len-3; + memcpy(cmd.u.diseqc.params, diseqc.data+3, diseqc.len-3); + if (::ioctl(m_secfd, SEC_DISEQC_SEND_MASTER_CMD, &cmd)) +#else struct dvb_diseqc_master_cmd cmd; - if (::ioctl(m_fd, FE_SET_TONE, SEC_TONE_OFF)) - return -EINVAL; - usleep(15 * 1000); memcpy(cmd.msg, diseqc.data, diseqc.len); cmd.msg_len = diseqc.len; - if (::ioctl(m_fd, FE_DISEQC_SEND_MASTER_CMD, &cmd)) +#endif + return -EINVAL; + return 0; +} + +#if HAVE_DVB_API_VERSION < 3 && !defined(SEC_DISEQC_SEND_BURST) + #define SEC_DISEQC_SEND_BURST _IO('o', 96) +#endif +RESULT eDVBFrontend::sendToneburst(int burst) +{ +#if HAVE_DVB_API_VERSION < 3 + secMiniCmd cmd = SEC_MINI_NONE; + if ( burst == eDVBSatelliteDiseqcParameters::A ) + cmd = SEC_MINI_A; + else if ( burst == eDVBSatelliteDiseqcParameters::B ) + cmd = SEC_MINI_B; + if (::ioctl(m_secfd, SEC_DISEQC_SEND_BURST, cmd)) return -EINVAL; - usleep(15 * 1000); - eDebug("diseqc ok"); +#endif return 0; } @@ -463,3 +970,43 @@ RESULT eDVBFrontend::setSEC(iDVBSatelliteEquipmentControl *sec) m_sec = sec; return 0; } + +RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list) +{ + m_sec_sequence = list; + return 0; +} + +RESULT eDVBFrontend::getData(int num, int &data) +{ + if ( num < 7 ) + { + data = m_data[num]; + return 0; + } + return -EINVAL; +} + +RESULT eDVBFrontend::setData(int num, int val) +{ + if ( num < 7 ) + { + m_data[num] = val; + return 0; + } + return -EINVAL; +} + +int eDVBFrontend::isCompatibleWith(ePtr &feparm) +{ + if (m_type != eDVBFrontend::feSatellite) + return 1; + + ASSERT(m_sec); + + eDVBFrontendParametersSatellite sat_parm; + + ASSERT(!feparm->getDVBS(sat_parm)); + + return m_sec->canTune(sat_parm, this, 1 << m_fe); +}