X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/452fdf6b7875f8185960f9b1649ba3d8fad4ab24..d58968e5ca43995658257b6e89f092c7572cde0a:/lib/dvb/sec.cpp diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index f7271c18..3d8084c8 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include @@ -11,6 +12,14 @@ #endif #include +//#define SEC_DEBUG + +#ifdef SEC_DEBUG +#define eSecDebug(arg...) eDebug(arg) +#else +#define eSecDebug(arg...) +#endif + DEFINE_REF(eDVBSatelliteEquipmentControl); eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance; @@ -105,40 +114,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrListm_inuse) - { - int ocsw = -1, - oucsw = -1, - oToneburst = -1; - linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw); - linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw); - linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst); -#if 0 - eDebug("compare csw %02x == lcsw %02x", - csw, ocsw); - if ( diseqc ) - eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x", - ucsw, oucsw, toneburst, oToneburst); - if ( rotor ) - eDebug("compare pos %d == current pos %d", - sat.orbital_position, oRotorPos); -#endif - if ( (csw != ocsw) || - ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || - ( rotor && RotorPos != sat.orbital_position ) ) - { -// eDebug("can not tune this transponder with linked tuner in use!!"); - ret=0; - } -// else -// eDebug("OK .. can tune this transponder with linked tuner in use :)"); - } - linked_fe->m_frontend->getData(direction, linked_ptr); -} - int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id ) { int ret=0, satcount=0; @@ -157,7 +132,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite lnb_param.m_satellites.find(sat.orbital_position); if ( sit != lnb_param.m_satellites.end()) { - int band=0, + long band=0, linked_prev_ptr=-1, linked_next_ptr=-1, satpos_depends_ptr=-1, @@ -166,9 +141,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite toneburst = di_param.m_toneburst_param, curRotorPos; - fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos); fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr); - fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr); fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr); if ( sat.frequency > lnb_param.m_lof_threshold ) @@ -191,8 +164,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite rotor = true; ret=10000; - if (rotor && curRotorPos != -1) - ret -= abs(curRotorPos-sat.orbital_position); } else { @@ -200,11 +171,76 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite ret = 15000; } - while (ret && linked_prev_ptr != -1) // check for linked tuners.. - checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos); + if (m_not_linked_slot_mask & slot_id) // frontend with direct connection? + { + long ocsw = -1, + oucsw = -1, + oToneburst = -1; + fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos); + fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr); + fe->getData(eDVBFrontend::CSW, ocsw); + fe->getData(eDVBFrontend::UCSW, oucsw); + fe->getData(eDVBFrontend::TONEBURST, oToneburst); + while (ret && linked_prev_ptr != -1) // check for linked tuners.. + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr; + if (linked_fe->m_inuse) + { + if ( (csw != ocsw) || + ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || + ( rotor && curRotorPos != sat.orbital_position ) ) + { + ret=0; + } + } + linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr); + } + while (ret && linked_next_ptr != -1) // check for linked tuners.. + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr; + if (linked_fe->m_inuse) + { + if ( (csw != ocsw) || + ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || + ( rotor && curRotorPos != sat.orbital_position ) ) + { + ret=0; + } + } + linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr); + } + } + else // linked frontend.. + { + long ocsw = -1, + oucsw = -1, + oToneburst = -1; + while (linked_prev_ptr != -1) + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr; + linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr); + if (linked_prev_ptr == -1) + { + iDVBFrontend *sec_fe = linked_fe->m_frontend; + sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos); + if (linked_fe->m_inuse) + { + sec_fe->getData(eDVBFrontend::CSW, ocsw); + sec_fe->getData(eDVBFrontend::UCSW, oucsw); + sec_fe->getData(eDVBFrontend::TONEBURST, oToneburst); + if ( (csw != ocsw) || + ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || + ( rotor && curRotorPos != sat.orbital_position ) ) + { + ret=0; + } + } + } + } + } - while (ret && linked_next_ptr != -1) // check for linked tuners.. - checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos); + if (ret && rotor && curRotorPos != -1) + ret -= abs(curRotorPos-sat.orbital_position); if (ret) if (satpos_depends_ptr != -1) @@ -213,13 +249,8 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite if ( satpos_depends_to_fe->m_inuse ) { if (!rotor || curRotorPos != sat.orbital_position) - { -// eDebug("can not tune this transponder ... rotor on other tuner is positioned to %d", oRotorPos); ret=0; - } } -// else -// eDebug("OK .. can tune this transponder satpos is correct :)"); } if (ret) @@ -227,13 +258,8 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite int lof = sat.frequency > lnb_param.m_lof_threshold ? lnb_param.m_lof_hi : lnb_param.m_lof_lo; int tuner_freq = abs(sat.frequency - lof); -// eDebug("tuner freq %d", tuner_freq); if (tuner_freq < 900000 || tuner_freq > 2200000) - { ret=0; -// eDebug("Transponder not tuneable with this lnb... %d Khz out of tuner range", -// tuner_freq); - } } } } @@ -245,9 +271,33 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite return ret; } +bool need_turn_fast(int turn_speed) +{ + if (turn_speed == eDVBSatelliteRotorParameters::FAST) + return true; + else if (turn_speed != eDVBSatelliteRotorParameters::SLOW) + { + int begin = turn_speed >> 16; // high word is start time + int end = turn_speed&0xFFFF; // low word is end time + time_t now_time = ::time(0); + tm nowTime; + localtime_r(&now_time, &nowTime); + int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1; + bool neg = end <= begin; + if (neg) { + int tmp = begin; + begin = end; + end = tmp; + } + if ((now >= begin && now < end) ^ neg) + return true; + } + return false; +} + #define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x) -RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id) +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout) { for (int idx=0; idx <= m_lnbidx; ++idx ) { @@ -263,9 +313,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA { eDVBSatelliteSwitchParameters &sw_param = sit->second; bool doSetFrontend = true; - bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id; + bool doSetVoltageToneFrontend = true; bool allowDiseqc1_2 = true; - int band=0, + long band=0, voltage = iDVBFrontend::voltageOff, tone = iDVBFrontend::toneOff, csw = di_param.m_committed_cmd, @@ -277,20 +327,30 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA lastRotorCmd = -1, curRotorPos = -1, satposDependPtr = -1; + iDVBFrontend *sec_fe=&frontend; - frontend.getData(eDVBFrontend::CSW, lastcsw); - frontend.getData(eDVBFrontend::UCSW, lastucsw); - frontend.getData(eDVBFrontend::TONEBURST, lastToneburst); - frontend.getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd); - frontend.getData(eDVBFrontend::ROTOR_POS, curRotorPos); frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr); - if (satposDependPtr != -1 && !doSetVoltageToneFrontend) + if (!(m_not_linked_slot_mask & slot_id)) // frontend with direct connection? { - allowDiseqc1_2 = false; - doSetVoltageToneFrontend = true; + long linked_prev_ptr; + frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr); + while (linked_prev_ptr != -1) + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr; + sec_fe = linked_fe->m_frontend; + sec_fe->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr); + } + if (satposDependPtr != -1) + allowDiseqc1_2 = false; } + sec_fe->getData(eDVBFrontend::CSW, lastcsw); + sec_fe->getData(eDVBFrontend::UCSW, lastucsw); + sec_fe->getData(eDVBFrontend::TONEBURST, lastToneburst); + sec_fe->getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd); + sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos); + if ( sat.frequency > lnb_param.m_lof_threshold ) band |= 1; @@ -395,7 +455,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA eDebugNoNewLine("0"); eDebug(""); #endif - if (doSetVoltageToneFrontend) { int RotorCmd=-1; @@ -485,8 +544,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA // check if voltage is disabled compare.voltage = iDVBFrontend::voltageOff; - compare.steps = +4; + compare.steps = +5; sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) ); // voltage is changed... use DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) ); @@ -517,6 +577,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA for ( int i = 0; i < loops;) // fill commands... { eDVBDiseqcCommand diseqc; + memset(diseqc.data, 0, MAX_DISEQC_LENGTH); diseqc.len = 4; diseqc.data[0] = i ? 0xE1 : 0xE0; diseqc.data[1] = 0x10; @@ -574,7 +635,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA } } - eDebug("RotorCmd %02x, lastRotorCmd %02x", RotorCmd, lastRotorCmd); + eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd); if ( RotorCmd != -1 && RotorCmd != lastRotorCmd ) { eSecCommand::pair compare; @@ -604,6 +665,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed eDVBDiseqcCommand diseqc; + memset(diseqc.data, 0, MAX_DISEQC_LENGTH); diseqc.len = 3; diseqc.data[0] = 0xE0; diseqc.data[1] = 0x31; // positioner @@ -634,6 +696,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( rotor_param.m_inputpower_parameters.m_use ) { // use measure rotor input power to detect rotor state + bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed); eSecCommand::rotor cmd; eSecCommand::pair compare; compare.voltage = VOLTAGE(18); @@ -667,23 +730,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); // check if rotor has started sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout .. we assume now the rotor is already at the correct position sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // goto loop start - sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +10 ) ); // timeout .. we assume now the rotor is already at the correct position + sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, turn_fast ? 9 : 8 ) ); // timeout .. we assume now the rotor is already at the correct position sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) ); // goto loop start //////////////////// - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); + if (turn_fast) + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) ); // 2 minutes running timeout // rotor running loop sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) ); cmd.direction=0; // check for stopped rotor - cmd.steps=+4; + cmd.steps=+3; sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); - sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +4 ) ); // timeout ? this should never happen + sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout ? this should never happen sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // running loop start ///////////////////// - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); } else { // use normal turning mode @@ -725,17 +788,20 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) ); sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); } - frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd); - frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position); + sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd); + sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position); } } } else + { + sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) ); csw = band; + } - frontend.setData(eDVBFrontend::CSW, csw); - frontend.setData(eDVBFrontend::UCSW, ucsw); - frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param); + sec_fe->setData(eDVBFrontend::NEW_CSW, csw); + sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw); + sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param); if (doSetVoltageToneFrontend) { @@ -751,9 +817,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) ); } + sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) ); + if (doSetFrontend) { - sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) ); sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } frontend.setSecSequence(sec_sequence); @@ -768,6 +836,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA RESULT eDVBSatelliteEquipmentControl::clear() { + eSecDebug("eDVBSatelliteEquipmentControl::clear()"); for (int i=0; i <= m_lnbidx; ++i) { m_lnbs[i].m_satellites.clear(); @@ -780,6 +849,18 @@ RESULT eDVBSatelliteEquipmentControl::clear() //reset some tuner configuration for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it) { + long tmp; + if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1) + { + FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w"); + if (!f || fwrite("B", 1, 1, f) != 1) + eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)"); + else + { + eDebug("set /proc/stb/tsmux/lnb_b_input to B OK"); + fclose(f); + } + } it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1); it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1); it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1); @@ -800,11 +881,13 @@ RESULT eDVBSatelliteEquipmentControl::addLNB() eDebug("no more LNB free... cnt is %d", m_lnbidx); return -ENOSPC; } + eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx); return 0; } RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask) { + eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask); if ( currentLNBValid() ) m_lnbs[m_lnbidx].slot_mask = slotmask; else @@ -814,6 +897,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask) RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl) { + eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFL(%d)", lofl); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_lof_lo = lofl; else @@ -823,6 +907,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl) RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh) { + eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFH(%d)", lofh); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_lof_hi = lofh; else @@ -832,6 +917,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh) RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold) { + eSecDebug("eDVBSatelliteEquipmentControl::setLNBThreshold(%d)", threshold); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_lof_threshold = threshold; else @@ -841,6 +927,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold) RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff) { + eSecDebug("eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(%d)", onoff); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_increased_voltage = onoff; else @@ -851,6 +938,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff) /* DiSEqC Specific Parameters */ RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode) { + eSecDebug("eDVBSatelliteEquipmentControl::setDiSEqcMode(%d)", diseqcmode); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_diseqc_mode = (eDVBSatelliteDiseqcParameters::t_diseqc_mode)diseqcmode; else @@ -860,6 +948,7 @@ RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode) RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst) { + eSecDebug("eDVBSatelliteEquipmentControl::setToneburst(%d)", toneburst); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_toneburst_param = (eDVBSatelliteDiseqcParameters::t_toneburst_param)toneburst; else @@ -869,6 +958,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst) RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats) { + eSecDebug("eDVBSatelliteEquipmentControl::setRepeats(%d)", repeats); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats; else @@ -878,6 +968,7 @@ RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats) RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command) { + eSecDebug("eDVBSatelliteEquipmentControl::setCommittedCommand(%d)", command); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command; else @@ -887,6 +978,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command) RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command) { + eSecDebug("eDVBSatelliteEquipmentControl::setUncommittedCommand(%d)", command); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_uncommitted_cmd = command; else @@ -896,6 +988,7 @@ RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command) RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order) { + eSecDebug("eDVBSatelliteEquipmentControl::setCommandOrder(%d)", order); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order; else @@ -905,6 +998,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order) RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff) { + eSecDebug("eDVBSatelliteEquipmentControl::setFastDiSEqc(%d)", onoff); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff; else @@ -914,6 +1008,7 @@ RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff) RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff) { + eSecDebug("eDVBSatelliteEquipmentControl::setSeqRepeat(%d)", onoff); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_diseqc_parameters.m_seq_repeat = onoff; else @@ -924,6 +1019,7 @@ RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff) /* Rotor Specific Parameters */ RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude) { + eSecDebug("eDVBSatelliteEquipmentControl::setLongitude(%f)", longitude); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_longitude=longitude; else @@ -933,6 +1029,7 @@ RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude) RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude) { + eSecDebug("eDVBSatelliteEquipmentControl::setLatitude(%f)", latitude); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_latitude=latitude; else @@ -942,6 +1039,7 @@ RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude) RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction) { + eSecDebug("eDVBSatelliteEquipmentControl::setLoDirection(%d)", direction); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_lo_direction=direction; else @@ -951,6 +1049,7 @@ RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction) RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction) { + eSecDebug("eDVBSatelliteEquipmentControl::setLaDirection(%d)", direction); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_la_direction=direction; else @@ -960,6 +1059,7 @@ RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction) RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff) { + eSecDebug("eDVBSatelliteEquipmentControl::setUseInputpower(%d)", onoff); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_use=onoff; else @@ -969,6 +1069,7 @@ RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff) RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta) { + eSecDebug("eDVBSatelliteEquipmentControl::setInputpowerDelta(%d)", delta); if ( currentLNBValid() ) m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_delta=delta; else @@ -979,6 +1080,7 @@ RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta) /* Satellite Specific Parameters */ RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position) { + eSecDebug("eDVBSatelliteEquipmentControl::addSatellite(%d)", orbital_position); if ( currentLNBValid() ) { std::map::iterator it = @@ -1004,6 +1106,7 @@ RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position) RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode) { + eSecDebug("eDVBSatelliteEquipmentControl::setVoltageMode(%d)", mode); if ( currentLNBValid() && m_curSat != m_lnbs[m_lnbidx].m_satellites.end() ) m_curSat->second.m_voltage_mode = (eDVBSatelliteSwitchParameters::t_voltage_mode)mode; else @@ -1014,6 +1117,7 @@ RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode) RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode) { + eSecDebug("eDVBSatelliteEquipmentControl::setToneMode(%d)", mode); if ( currentLNBValid() ) { if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() ) @@ -1028,6 +1132,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode) RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num) { + eSecDebug("eDVBSatelliteEquipmentControl::setRotorPosNum(%d)", rotor_pos_num); if ( currentLNBValid() ) { if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() ) @@ -1040,6 +1145,16 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num) return 0; } +RESULT eDVBSatelliteEquipmentControl::setRotorTurningSpeed(int speed) +{ + eSecDebug("eDVBSatelliteEquipmentControl::setRotorTurningSpeed(%d)", speed); + if ( currentLNBValid() ) + m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_turning_speed = speed; + else + return -ENOENT; + return 0; +} + struct sat_compare { int orb_pos, lofl, lofh; @@ -1065,129 +1180,35 @@ struct sat_compare } }; -PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2) +RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) { - ePyObject ret; - + eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2); if (tu1 != tu2) { eDVBRegisteredFrontend *p1=NULL, *p2=NULL; - int cnt=0; - for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt) + + for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it) { - if (cnt == tu1) + if (it->m_frontend->getSlotID() == tu1) p1 = *it; - else if (cnt == tu2) + else if (it->m_frontend->getSlotID() == tu2) p2 = *it; } - if (p1 && p2) { - // check for linked tuners - - do + p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2); + p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1); + if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)")) { - int tmp; - p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp); - if (tmp != -1) - p1 = (eDVBRegisteredFrontend*)tmp; + FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w"); + if (!f || fwrite("A", 1, 1, f) != 1) + eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)"); else - break; - } - while (true); - - do - { - int tmp; - p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp); - if (tmp != -1) - p2 = (eDVBRegisteredFrontend*)tmp; - else - break; - } - while (true); - - if (p1 != p2) - { - int tmp1=-1; - int tmp2=-1; - // check for rotor dependency - p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1); - if (tmp1 != -1) - p1 = (eDVBRegisteredFrontend*)tmp1; - p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2); - if (tmp2 != -1) - p2 = (eDVBRegisteredFrontend*)tmp2; - if (p1 != p2) { - int tu1_mask = 1 << p1->m_frontend->getSlotID(), - tu2_mask = 1 << p2->m_frontend->getSlotID(); - std::set tu1sats, tu2sats; - std::list tu1difference, tu2difference; - std::insert_iterator > insert1(tu1difference, tu1difference.begin()), - insert2(tu2difference, tu2difference.begin()); - for (int idx=0; idx <= m_lnbidx; ++idx ) - { - eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx]; - for (std::map::iterator sit(lnb_param.m_satellites.begin()); - sit != lnb_param.m_satellites.end(); ++sit) - { - if ( lnb_param.slot_mask & tu1_mask ) - tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi)); - if ( lnb_param.slot_mask & tu2_mask ) - tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi)); - } - } - std::set_difference(tu1sats.begin(), tu1sats.end(), - tu2sats.begin(), tu2sats.end(), - insert1); - std::set_difference(tu2sats.begin(), tu2sats.end(), - tu1sats.begin(), tu1sats.end(), - insert2); - if (!tu1sats.empty() || !tu2sats.empty()) - { - int idx=0; - ret = PyList_New(2+tu1difference.size()+tu2difference.size()); - - PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu1difference.size())); - for(std::list::iterator it(tu1difference.begin()); it != tu1difference.end(); ++it) - PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos)); - - PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu2difference.size())); - for(std::list::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it) - PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos)); - } + eDebug("set /proc/stb/tsmux/lnb_b_input to A OK"); + fclose(f); } } - } - } - if (!ret) - { - ret = PyList_New(2); - PyList_SET_ITEM(ret, 0, PyInt_FromLong(0)); - PyList_SET_ITEM(ret, 1, PyInt_FromLong(0)); - } - return ret; -} - -RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) -{ - if (tu1 != tu2) - { - eDVBRegisteredFrontend *p1=NULL, *p2=NULL; - - int cnt=0; - for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt) - { - if (cnt == tu1) - p1 = *it; - else if (cnt == tu2) - p2 = *it; - } - if (p1 && p2) - { - p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2); - p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1); return 0; } } @@ -1196,23 +1217,23 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2) { + eSecDebug("eDVBSatelliteEquipmentControl::setTunerDepends(%d, %d)", tu1, tu2); if (tu1 == tu2) return -1; eDVBRegisteredFrontend *p1=NULL, *p2=NULL; - int cnt=0; - for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt) + for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it) { - if (cnt == tu1) + if (it->m_frontend->getSlotID() == tu1) p1 = *it; - else if (cnt == tu2) + else if (it->m_frontend->getSlotID() == tu2) p2 = *it; } if (p1 && p2) { - p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p2); - p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p1); + p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2); + p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1); return 0; } return -1; @@ -1220,6 +1241,7 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2) void eDVBSatelliteEquipmentControl::setSlotNotLinked(int slot_no) { + eSecDebug("eDVBSatelliteEquipmentControl::setSlotNotLinked(%d)", slot_no); m_not_linked_slot_mask |= (1 << slot_no); }