fix tune failed problems on fast zap when a diseqc swicth is in use
[enigma2.git] / lib / dvb / sec.cpp
index 10b362ab1a87dded4a8c4a1c1808eff0a0d79bd2..3d8084c84d2f0d3a0bf8624fa326393560bc421b 100644 (file)
@@ -114,40 +114,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setRotorPosNum(1); // stored pos 1
 }
 
-static void checkLinkedParams(int direction, long &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
-{
-       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
-       if (linked_fe->m_inuse)
-       {
-               long 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, (long&)linked_ptr);
-}
-
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
 {
        int ret=0, satcount=0;
@@ -175,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 )
@@ -200,8 +164,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                rotor = true;
 
                                        ret=10000;
-                                       if (rotor && curRotorPos != -1)
-                                               ret -= abs(curRotorPos-sat.orbital_position);
                                }
                                else
                                {
@@ -209,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)
@@ -222,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)
@@ -236,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);
-                                       }
                                }
                        }
                }
@@ -296,7 +313,7 @@ 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;
                        long band=0,
                                voltage = iDVBFrontend::voltageOff,
@@ -310,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;
 
@@ -428,7 +455,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eDebugNoNewLine("0");
                                eDebug("");
 #endif
-
                                if (doSetVoltageToneFrontend)
                                {
                                        int RotorCmd=-1;
@@ -518,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) );
@@ -761,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)
                        {
@@ -787,6 +817,8 @@ 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, tunetimeout) );
@@ -849,7 +881,7 @@ RESULT eDVBSatelliteEquipmentControl::addLNB()
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }
-       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx-1);
+       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
        return 0;
 }
 
@@ -1148,111 +1180,6 @@ struct sat_compare
        }
 };
 
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
-{
-       ePyObject ret;
-
-       if (tu1 != tu2)
-       {
-               eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-               int cnt=0;
-               for (eSmartPtrList<eDVBRegisteredFrontend>::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)
-               {
-                       // check for linked tuners
-
-                       do 
-                       {
-                               long tmp;
-                               p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p1 = (eDVBRegisteredFrontend*)tmp;
-                               else
-                                       break;
-                       }
-                       while (true);
-
-                       do 
-                       {
-                               long tmp;
-                               p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p2 = (eDVBRegisteredFrontend*)tmp;
-                               else
-                                       break;
-                       }
-                       while (true);
-
-                       if (p1 != p2)
-                       {
-                               long tmp1=-1;
-                               long 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<sat_compare> tu1sats, tu2sats;
-                                       std::list<sat_compare> tu1difference, tu2difference;
-                                       std::insert_iterator<std::list<sat_compare> > 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<int, eDVBSatelliteSwitchParameters>::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<sat_compare>::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<sat_compare>::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it)
-                                                       PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
-                                       }
-                               }
-                       }
-               }
-       }
-       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)
 {
        eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
@@ -1260,12 +1187,11 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
 
-               int cnt=0;
-               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+               for (eSmartPtrList<eDVBRegisteredFrontend>::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)
@@ -1297,12 +1223,11 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 
        eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
 
-       int cnt=0;
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+       for (eSmartPtrList<eDVBRegisteredFrontend>::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)