non critical fixes (better memory handling)
[enigma2.git] / lib / dvb / sec.cpp
index c13334d1236f66d3c2c1752cba3bbebbfa26cc62..43d56e306c55cad242edace9d6f39d76281c4c0a 100644 (file)
@@ -2,6 +2,8 @@
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
 
+#include <set>
+
 #if HAVE_DVB_API_VERSION < 3
 #define FREQUENCY Frequency
 #else
@@ -25,7 +27,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        addLNB();
        setLNBTunerMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10607000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -42,7 +44,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        addLNB();
        setLNBTunerMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -59,7 +61,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        addLNB();
        setLNBTunerMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -91,39 +93,84 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setRotorPosNum(1); // stored pos 1
 }
 
+static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor)
+{
+       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
+       int oRotorPos = -1;
+       linked_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos);
+       if (linked_fe->m_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 && oRotorPos != 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 :)");
+       }
+       else if (rotor && oRotorPos != -1)
+       {
+               ret -= abs(oRotorPos-sat.orbital_position);
+//             eDebug("decrement rotor pos for linked tuner!!");
+       }
+       linked_fe->m_frontend->getData(direction, linked_ptr);
+}
+
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
 {
-       int ret=0;
+       int ret=0, satcount=0;
 
        for (int idx=0; idx <= m_lnbidx; ++idx )
        {
+               bool rotor=false;
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
                if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner?
                {
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 
+                       satcount += lnb_param.m_satellites.size();
+
                        std::map<int, eDVBSatelliteSwitchParameters>::iterator sit =
                                lnb_param.m_satellites.find(sat.orbital_position);
                        if ( sit != lnb_param.m_satellites.end())
                        {
                                int band=0,
-                                       linked_to=-1, // linked tuner
-                                       satpos_depends_to=-1,
+                                       linked_prev_ptr=-1,
+                                       linked_next_ptr=-1,
+                                       satpos_depends_ptr=-1,
                                        csw = di_param.m_committed_cmd,
                                        ucsw = di_param.m_uncommitted_cmd,
                                        toneburst = di_param.m_toneburst_param,
                                        curRotorPos;
 
-                               fe->getData(6, curRotorPos);
-                               fe->getData(7, linked_to);
-                               fe->getData(8, satpos_depends_to);
+                               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 )
                                        band |= 1;
                                if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
                                        band |= 2;
 
-                               bool rotor=false;
                                bool diseqc=false;
 
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
@@ -136,73 +183,42 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                csw |= band;
 
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
-                                       {
-                                               rotor=true;
-                                               if ( curRotorPos == sat.orbital_position )
-                                                       ret=20;  // rotor on correct orbpos = prio 20
-                                               else
-                                                       ret=10;  // rotor must turn to correct orbpos = prio 10
-                                       }
-                                       else
-                                               ret = 30;  // no rotor = prio 30
+                                               rotor = true;
+
+                                       ret=10000;
+                                       if (rotor && curRotorPos != -1)
+                                               ret -= abs(curRotorPos-sat.orbital_position);
                                }
                                else
                                {
                                        csw = band;
-                                       ret = 40;  // no diseqc = prio 40
+                                       ret = 15000;
                                }
 
-                               if (linked_to != -1)  // check for linked tuners..
-                               {
-                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
-                                       if (linked_fe->m_inuse)
+                               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);
+
+                               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);
+
+                               if (ret)
+                                       if (satpos_depends_ptr != -1)
                                        {
-                                               int ocsw = -1,
-                                                       oucsw = -1,
-                                                       oToneburst = -1,
-                                                       oRotorPos = -1;
-                                               linked_fe->m_frontend->getData(0, ocsw);
-                                               linked_fe->m_frontend->getData(1, oucsw);
-                                               linked_fe->m_frontend->getData(2, oToneburst);
-                                               linked_fe->m_frontend->getData(6, oRotorPos);
-#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 && oRotorPos != sat.orbital_position ) )
+                                               eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
+                                               if ( satpos_depends_to_fe->m_inuse )
                                                {
-//                                                     eDebug("can not tune this transponder with linked tuner in use!!");
-                                                       ret=0;
+                                                       int oRotorPos = -1;
+                                                       satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos);
+                                                       if (!rotor || oRotorPos != 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 with linked tuner in use :)");
+//                                                     eDebug("OK .. can tune this transponder satpos is correct :)");
                                        }
-                               }
 
-                               if (satpos_depends_to != -1)  // check for linked tuners..
-                               {
-                                       eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_to;
-                                       if ( satpos_depends_to_fe->m_inuse )
-                                       {
-                                               int oRotorPos = -1;
-                                               satpos_depends_to_fe->m_frontend->getData(6, oRotorPos);
-                                               if (!rotor || oRotorPos != 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)
                                {
                                        int lof = sat.frequency > lnb_param.m_lof_threshold ?
@@ -219,6 +235,8 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                        }
                }
        }
+       if (ret && satcount)
+               ret -= (satcount-1);
        return ret;
 }
 
@@ -245,8 +263,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        bool doSetVoltageToneFrontend = true;
                        bool doSetFrontend = true;
                        int band=0,
-                               linked_to=-1, // linked tuner
-                               satpos_depends_to=-1,
+                               linked_prev_ptr=-1, // linked tuner
+                               linked_next_ptr=-1, // linked tuner
+                               satpos_depends_ptr=-1,
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,
@@ -258,27 +277,43 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                lastRotorCmd = -1,
                                curRotorPos = -1;
 
-                       frontend.getData(0, lastcsw);
-                       frontend.getData(1, lastucsw);
-                       frontend.getData(2, lastToneburst);
-                       frontend.getData(5, lastRotorCmd);
-                       frontend.getData(6, curRotorPos);
-                       frontend.getData(7, linked_to);
-                       frontend.getData(8, satpos_depends_to);
+                       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::LINKED_PREV_PTR, linked_prev_ptr);
+                       frontend.getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+                       frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);
 
-                       if (linked_to != -1)
+                       while (linked_prev_ptr != -1)  // check for linked tuners..
                        {
-                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
+                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
                                if (linked_fe->m_inuse)
                                {
                                        eDebug("[SEC] frontend is linked with another and the other one is in use.. so we dont do SEC!!");
                                        linked=true;
+                                       break;
                                }
+                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
                        }
 
-                       if (satpos_depends_to != -1)
+                       if (!linked)
+                               while (linked_next_ptr != -1)  // check for linked tuners..
+                               {
+                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
+                                       if (linked_fe->m_inuse)
+                                       {
+                                               eDebug("[SEC] frontend is linked with another and the other one is in use.. so we dont do SEC!!");
+                                               linked=true;
+                                               break;
+                                       }
+                                       linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+                               }
+
+                       if (satpos_depends_ptr != -1)
                        {
-                               eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_to;
+                               eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
                                if (satpos_fe->m_inuse)
                                {
                                        if ( di_param.m_diseqc_mode != eDVBSatelliteDiseqcParameters::V1_2 )
@@ -298,7 +333,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                        parm.FREQUENCY = abs(parm.FREQUENCY);
 
-                       frontend.setData(9, sat.frequency - parm.FREQUENCY);
+                       frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
 
                        if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
                                band |= 2;
@@ -395,11 +430,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                                int RotorCmd=-1;
                                bool useGotoXX = false;
-                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
+                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+                                       && !sat.no_rotor_command_on_tune )
                                {
                                        if (depend_satpos_mode || linked)
                                                // in this both modes we dont really turn the rotor.... but in canTune we need the satpos
-                                               frontend.setData(6, sat.orbital_position);
+                                               frontend.setData(eDVBFrontend::ROTOR_POS, sat.orbital_position);
                                        else
                                        {
                                                if (sw_param.m_rotorPosNum) // we have stored rotor pos?
@@ -459,9 +495,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                                if ( send_mask )
                                {
+                                       eSecCommand::pair compare;
+                                       compare.steps = +3;
+                                       compare.tone = iDVBFrontend::toneOff;
+                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
-                                       eSecCommand::pair compare;
                                        compare.voltage = iDVBFrontend::voltageOff;
                                        compare.steps = +4;
                                        // the next is a check if voltage is switched off.. then we first set a voltage :)
@@ -482,8 +521,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
                                        compare.steps = +3;
                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-                                       // voltage was disabled..so we wait a longer time .. for normal switches 200ms should be enough
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );
+                                       // voltage was disabled..so we wait a longer time .. for normal switches 750ms should be enough
+                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) );
 
                                        for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
                                        {
@@ -500,8 +539,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                if ( send_mask & 2 )
                                                        ++loops;
 
-                                               for ( int i=0; i < di_param.m_repeats; ++i )
-                                               loops *= 2;
+                                               loops <<= di_param.m_repeats;
 
                                                for ( int i = 0; i < loops;)  // fill commands...
                                                {
@@ -519,10 +557,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                diseqc.data[2] = 0x38;
                                                                diseqc.data[3] = csw;
                                                        }
-                                                       else
+                                                       else  // no committed command confed.. so send uncommitted..
                                                        {
-                                                               diseqc.data[2] = 0x00;
-                                                               diseqc.data[3] = 0x00;
+                                                               diseqc.data[2] = 0x39;
+                                                               diseqc.data[3] = ucsw;
                                                        }
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
@@ -536,7 +574,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                        cmd=0x38;
                                                                if (cmd)
                                                                {
-                                                                       static int delay = (120 - 54) / 2;  // standard says 100msek between two repeated commands
+                                                                       int delay = di_param.m_repeats ? (120 - 54) / 2 : 120;  // standard says 100msek between two repeated commands
                                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) );
                                                                        diseqc.data[2]=cmd;
                                                                        diseqc.data[3]=(cmd==0x38) ? csw : ucsw;
@@ -565,25 +603,34 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                {
                                        eSecCommand::pair compare;
-                                       compare.voltage = iDVBFrontend::voltageOff;
-                                       compare.steps = +4;
-                                       // the next is a check if voltage is switched off.. then we first set a voltage :)
-                                       // else we set voltage after all diseqc stuff..
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
+                                       if (!send_mask)
+                                       {
+                                               compare.steps = +3;
+                                               compare.tone = iDVBFrontend::toneOff;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
 
-                                       if (rotor_param.m_inputpower_parameters.m_use)
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
-                                       else
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V
+                                               compare.voltage = iDVBFrontend::voltageOff;
+                                               compare.steps = +4;
+                                               // the next is a check if voltage is switched off.. then we first set a voltage :)
+                                               // else we set voltage after all diseqc stuff..
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
 
-                                       // voltage was disabled..so we wait a longer time ..
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 500) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +7) );  // no need to send stop rotor cmd
+                                               if (rotor_param.m_inputpower_parameters.m_use)
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
+                                               else
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V
 
-                                       if (send_mask)
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd
+                                               // voltage was disabled..so we wait a longer time ..
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +9) );  // no need to send stop rotor cmd and recheck voltage
+                                       }
                                        else
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +1) );
+                                       {
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +9) );  // no need to send stop rotor cmd and recheck voltage
+                                       }
 
                                        eDVBDiseqcCommand diseqc;
                                        diseqc.len = 3;
@@ -619,19 +666,19 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eSecCommand::rotor cmd;
                                                eSecCommand::pair compare;
                                                compare.voltage = VOLTAGE(18);
-                                               compare.steps = +2;
+                                               compare.steps = +3;
                                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
 // measure idle power values
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
                                                sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-                                               compare.voltage = 1;
+                                               compare.val = 1;
                                                compare.steps = -2;
                                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec before measure
                                                sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-                                               compare.voltage = 0;
+                                               compare.val = 0;
                                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
 ////////////////////////////
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
@@ -671,7 +718,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eSecCommand::rotor cmd;
                                                eSecCommand::pair compare;
                                                compare.voltage = VOLTAGE(13);
-                                               compare.steps = +2;
+                                               compare.steps = +3;
                                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
@@ -686,7 +733,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
 
+                                               compare.tone = tone;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
 
                                                cmd.direction=1;  // check for running rotor
@@ -702,16 +752,16 @@ 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(3, RotorCmd);
-                                       frontend.setData(4, sat.orbital_position);
+                                       frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+                                       frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
                                }
                        }
                        else
                                csw = band;
 
-                       frontend.setData(0, csw);
-                       frontend.setData(1, ucsw);
-                       frontend.setData(2, di_param.m_toneburst_param);
+                       frontend.setData(eDVBFrontend::CSW, csw);
+                       frontend.setData(eDVBFrontend::UCSW, ucsw);
+                       frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
 
                        if (!linked && doSetVoltageToneFrontend)
                        {
@@ -722,6 +772,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 10) );
 
+                               compare.tone = tone;
+                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
                        }
@@ -752,34 +804,13 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 
 // clear linked tuner configuration
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
-               it->m_frontend->setData(7, -1);
-
-       return 0;
-}
-
-// helper function for setTunerLinked and setTunerDepends
-RESULT eDVBSatelliteEquipmentControl::setDependencyPointers( int tu1, int tu2, int dest_data_byte )
-{
-       if (tu1 == tu2)
-               return -1;
-
-       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)
-       {
-               p1->m_frontend->setData(dest_data_byte, (int)p2);  // this is evil..
-               p2->m_frontend->setData(dest_data_byte, (int)p1);
-               return 0;
+               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);
        }
-       return -1;
+
+       return 0;
 }
 
 /* LNB Specific Parameters */
@@ -1032,9 +1063,35 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
        return 0;
 }
 
-PyObject *eDVBSatelliteEquipmentControl::get_different_satellites(int tu1, int tu2)
+struct sat_compare
+{
+       int orb_pos, lofl, lofh;
+       sat_compare(int o, int lofl, int lofh)
+               :orb_pos(o), lofl(lofl), lofh(lofh)
+       {}
+       sat_compare(const sat_compare &x)
+               :orb_pos(x.orb_pos), lofl(x.lofl), lofh(x.lofh)
+       {}
+       bool operator < (const sat_compare & cmp) const
+       {
+               if (orb_pos == cmp.orb_pos)
+               {
+                       if ( abs(lofl-cmp.lofl) < 200000 )
+                       {
+                               if (abs(lofh-cmp.lofh) < 200000)
+                                       return false;
+                               return lofh<cmp.lofh;
+                       }
+                       return lofl<cmp.lofl;
+               }
+               return orb_pos < cmp.orb_pos;
+       }
+};
+
+PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
 {
-       PyObject *ret=0;
+       ePyObject ret;
+
        if (tu1 != tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
@@ -1046,45 +1103,142 @@ PyObject *eDVBSatelliteEquipmentControl::get_different_satellites(int tu1, int t
                        else if (cnt == tu2)
                                p2 = *it;
                }
+
                if (p1 && p2)
                {
                        // check for linked tuners
-                       int tmp1, tmp2;
-                       p1->m_frontend->getData(7, tmp1);
-                       p2->m_frontend->setData(7, tmp2);
-                       if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+
+                       do 
+                       {
+                               int tmp;
+                               p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
+                               if (tmp != -1)
+                                       p1 = (eDVBRegisteredFrontend*)tmp;
+                               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(8, tmp1);
-                               p2->m_frontend->setData(8, tmp2);
-                               if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+                               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)
                                {
-                                       // here we know the tuners are not linked and no rotor dependency exist.
-                                       // now we check all configured satellites/lnb for difference and at all difference
-                                       // to a list of tuples with first value tuner number and second value orbital position
-                                       // of satellite
-                                       ret = PyList_New(0);
-                                       // FIXMEE !! fill list (compare satellites (lofh, lofl, lof threshold, opos))
+                                       int tu1_mask = 1 << p1->m_frontend->getID(),
+                                               tu2_mask = 1 << p2->m_frontend->getID();
+                                       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.tuner_mask & tu1_mask )
+                                                               tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
+                                                       if ( lnb_param.tuner_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)
        {
-               Py_INCREF(Py_None);
-               ret = Py_None;
+               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)
 {
-       return setDependencyPointers(tu1, tu2, 7);
+       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)
+               {
+                       p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
+                       p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
+                       return 0;
+               }
+       }
+       return -1;
 }
 
 RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 {
-       return setDependencyPointers(tu1, tu2, 8);
+       if (tu1 == tu2)
+               return -1;
+
+       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)
+       {
+               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p2);
+               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p1);
+               return 0;
+       }
+       return -1;
 }
 
 bool eDVBSatelliteEquipmentControl::isRotorMoving()