fix python refcounting
[enigma2.git] / lib / dvb / sec.cpp
index a964b75ece43501db15c09ac1632909e9e4cfccd..0c1d79ab29d8195b49fc9875d04bf045f3e86b71 100644 (file)
@@ -1,4 +1,5 @@
 #include <config.h>
+#include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
 
 
 DEFINE_REF(eDVBSatelliteEquipmentControl);
 
-eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
+eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
+
+eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends)
+       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false)
 {
-       m_lnblist.push_back(eDVBSatelliteLNBParameters());
-       eDVBSatelliteLNBParameters &lnb1_ref = m_lnblist.back();
-       eDVBSatelliteDiseqcParameters &diseqc1_ref = lnb1_ref.m_diseqc_parameters;
-
-/*
-       eDVBSatelliteRotorParameters &rotor_ref = lnb1_ref.m_rotor_parameters;
-       eDVBSatelliteRotorParameters::eDVBSatelliteRotorInputpowerParameters &rotor_input_ref = rotor_ref.m_inputpower_parameters;
-       eDVBSatelliteRotorParameters::eDVBSatelliteRotorGotoxxParameters &rotor_gotoxx_ref = rotor_ref.m_gotoxx_parameters;
-
-       rotor_input_ref.m_use = true;
-       rotor_input_ref.m_threshold = 50;
-
-       rotor_gotoxx_ref.m_can_use = true;
-       rotor_gotoxx_ref.m_lo_direction = eDVBSatelliteRotorParameters::EAST;
-       rotor_gotoxx_ref.m_la_direction = eDVBSatelliteRotorParameters::NORTH;
-       rotor_gotoxx_ref.m_longitude = 8.683;
-       rotor_gotoxx_ref.m_latitude = 51.017;*/
-
-       lnb1_ref.m_lof_hi = 10600000;
-       lnb1_ref.m_lof_lo = 9750000;
-       lnb1_ref.m_lof_threshold = 11700000;
-
-       diseqc1_ref.m_diseqc_mode = eDVBSatelliteDiseqcParameters::V1_0;
-       diseqc1_ref.m_committed_cmd = eDVBSatelliteDiseqcParameters::AA;
-       diseqc1_ref.m_repeats = 0;
-       diseqc1_ref.m_seq_repeat = false;
-       diseqc1_ref.m_swap_cmds = false;
-       diseqc1_ref.m_toneburst_param = eDVBSatelliteDiseqcParameters::NO;
-       diseqc1_ref.m_uncommitted_cmd = 0;
-       diseqc1_ref.m_use_fast = 0;
-
-       eDVBSatelliteSwitchParameters &astra_ref = lnb1_ref.m_satellites[192];
-       astra_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
-       astra_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
-
-// HOTBIRD
-
-       m_lnblist.push_back(eDVBSatelliteLNBParameters());
-       eDVBSatelliteLNBParameters &lnb2_ref = m_lnblist.back();
-       eDVBSatelliteDiseqcParameters &diseqc2_ref = lnb2_ref.m_diseqc_parameters;
-
-       lnb2_ref.m_lof_hi = 10600000;
-       lnb2_ref.m_lof_lo = 9750000;
-       lnb2_ref.m_lof_threshold = 11700000;
-
-       diseqc2_ref.m_diseqc_mode = eDVBSatelliteDiseqcParameters::V1_0;
-       diseqc2_ref.m_committed_cmd = eDVBSatelliteDiseqcParameters::AB;
-       diseqc2_ref.m_repeats = 0;
-       diseqc2_ref.m_seq_repeat = false;
-       diseqc2_ref.m_swap_cmds = false;
-       diseqc1_ref.m_toneburst_param = eDVBSatelliteDiseqcParameters::NO;
-       diseqc2_ref.m_uncommitted_cmd = 0;
-       diseqc2_ref.m_use_fast = 0;
-
-       eDVBSatelliteSwitchParameters &hotbird_ref = lnb2_ref.m_satellites[130];
-       hotbird_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
-       hotbird_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
+       if (!instance)
+               instance = this;
+
+       clear();
+
+// ASTRA
+       addLNB();
+       setLNBTunerMask(3);
+       setLNBLOFL(9750000);
+       setLNBThreshold(11750000);
+       setLNBLOFH(10607000);
+       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
+       setToneburst(eDVBSatelliteDiseqcParameters::NO);
+       setRepeats(0);
+       setCommittedCommand(eDVBSatelliteDiseqcParameters::BB);
+       setCommandOrder(0); // committed, toneburst
+       setFastDiSEqC(true);
+       setSeqRepeat(false);
+       addSatellite(192);
+       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
+       setToneMode(eDVBSatelliteSwitchParameters::HILO);
+
+// Hotbird
+       addLNB();
+       setLNBTunerMask(3);
+       setLNBLOFL(9750000);
+       setLNBThreshold(11750000);
+       setLNBLOFH(10600000);
+       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
+       setToneburst(eDVBSatelliteDiseqcParameters::NO);
+       setRepeats(0);
+       setCommittedCommand(eDVBSatelliteDiseqcParameters::AB);
+       setCommandOrder(0); // committed, toneburst
+       setFastDiSEqC(true);
+       setSeqRepeat(false);
+       addSatellite(130);
+       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
+       setToneMode(eDVBSatelliteSwitchParameters::HILO);
+
+// Rotor
+       addLNB();
+       setLNBTunerMask(3);
+       setLNBLOFL(9750000);
+       setLNBThreshold(11750000);
+       setLNBLOFH(10600000);
+       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
+       setToneburst(eDVBSatelliteDiseqcParameters::NO);
+       setRepeats(0);
+       setCommittedCommand(eDVBSatelliteDiseqcParameters::AA);
+       setCommandOrder(0); // committed, toneburst
+       setFastDiSEqC(true);
+       setSeqRepeat(false);
+       setLaDirection(eDVBSatelliteRotorParameters::NORTH);
+       setLoDirection(eDVBSatelliteRotorParameters::EAST);
+       setLatitude(51.017);
+       setLongitude(8.683);
+       setUseInputpower(true);
+       setInputpowerDelta(50);
+
+       addSatellite(235);
+       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
+       setToneMode(eDVBSatelliteSwitchParameters::HILO);
+       setRotorPosNum(0);
+
+       addSatellite(284);
+       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
+       setToneMode(eDVBSatelliteSwitchParameters::HILO);
+       setRotorPosNum(0);
+
+       addSatellite(420);
+       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
+       setToneMode(eDVBSatelliteSwitchParameters::HILO);
+       setRotorPosNum(1); // stored pos 1
 }
 
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)
+int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
 {
-       std::list<eDVBSatelliteLNBParameters>::iterator it = m_lnblist.begin();
-       for (;it != m_lnblist.end(); ++it )
+       int ret=0;
+
+       for (int idx=0; idx <= m_lnbidx; ++idx )
        {
-               eDVBSatelliteLNBParameters &lnb_param = *it;
+               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;
+
+                       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=0, // linked tuner
+                                       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);
+
+                               if ( sat.frequency > lnb_param.m_lof_threshold )
+                                       band |= 1;
+                               if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
+                                       band |= 2;
+
+                               bool rotor=false;
+                               bool diseqc=false;
+
+                               if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
+                               {
+                                       diseqc=true;
+                                       if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
+                                               csw = 0xF0 | (csw << 2);
+
+                                       csw |= band;
+
+                                       if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
+                                       {
+                                               rotor=true;
+                                               if ( curRotorPos == sat.orbital_position )
+                                                       ret=20;
+                                               else
+                                                       ret=10;
+                                       }
+                               }
+                               else
+                                       csw = band;
+
+                               if (!ret)
+                                       ret=40;
+
+                               if (linked_to != -1)  // check for linked tuners..
+                               {
+                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
+                                       if (linked_fe->m_inuse)
+                                       {
+                                               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 ) )
+                                               {
+//                                                     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 :)");
+                                       }
+                               }
+                       }
+               }
+       }
+       return ret;
+}
+
+#define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x)
+
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)
+{
+       bool linked=false;
+
+       for (int idx=0; idx <= m_lnbidx; ++idx )
+       {
+               eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
+               if (!(lnb_param.tuner_mask & frontend_id)) // lnb for correct tuner?
+                       continue;
                eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
                eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
 
@@ -93,7 +214,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
 
-                       int hi=0,
+                       int band=0,
+                               linked_to=-1, // linked tuner
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,
@@ -110,16 +232,42 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        frontend.getData(2, lastToneburst);
                        frontend.getData(5, lastRotorCmd);
                        frontend.getData(6, curRotorPos);
+                       frontend.getData(7, linked_to);
+
+                       if (linked_to != -1)
+                       {
+                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
+                               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;
+                               }
+                       }
 
                        if ( sat.frequency > lnb_param.m_lof_threshold )
-                               hi = 1;
+                               band |= 1;
 
-                       if (hi)
+                       if (band&1)
                                parm.FREQUENCY = sat.frequency - lnb_param.m_lof_hi;
                        else
                                parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo;
 
-                       parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
+                       if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
+                               band |= 2;
+
+                       switch (sat.inversion)
+                       {
+                               case eDVBFrontendParametersCable::Inversion::On:
+                                       parm.INVERSION = INVERSION_ON;
+                                       break;
+                               case eDVBFrontendParametersCable::Inversion::Off:
+                                       parm.INVERSION = INVERSION_OFF;
+                                       break;
+                               default:
+                               case eDVBFrontendParametersCable::Inversion::Unknown:
+                                       parm.INVERSION = INVERSION_AUTO;
+                                       break;
+                       }
 
                        switch (sat.fec)
                        {
@@ -151,17 +299,16 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V
                                || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical
                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
-                               voltage = iDVBFrontend::voltage13;
+                               voltage = VOLTAGE(13);
                        else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V
                                || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal
                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
-                               voltage = iDVBFrontend::voltage18;
-
+                               voltage = VOLTAGE(18);
                        if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
-                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && hi ) )
+                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
                                tone = iDVBFrontend::toneOn;
                        else if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::OFF)
-                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !hi ) )
+                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !(band&1) ) )
                                tone = iDVBFrontend::toneOff;
 
                        eSecCommandList sec_sequence;
@@ -169,13 +316,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {
                                if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
-                               {
                                        csw = 0xF0 | (csw << 2);
-                                       if (hi)
-                                               csw |= 1;
-                                       if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
-                                               csw |= 2;
-                               }
+
+                               csw |= band;
 
                                bool send_csw =
                                        (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);
@@ -189,17 +332,57 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                        (di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
                                bool changed_burst = send_burst && toneburst != lastToneburst;
 
-                               bool send_diseqc = changed_ucsw;
-                               if (!send_diseqc)
-                                       send_diseqc = changed_burst && (send_ucsw || send_csw);
-                               if (!send_diseqc)
+                               int send_mask = 0; /*
+                                       1 must send csw
+                                       2 must send ucsw
+                                       4 send toneburst first
+                                       8 send toneburst at end */
+                               if (changed_burst) // toneburst first and toneburst changed
+                               {
+                                       if (di_param.m_command_order&1)
+                                       {
+                                               send_mask |= 4;
+                                               if ( send_csw )
+                                                       send_mask |= 1;
+                                               if ( send_ucsw )
+                                                       send_mask |= 2;
+                                       }
+                                       else
+                                               send_mask |= 8;
+                               }
+                               if (changed_ucsw)
+                               {
+                                       send_mask |= 2;
+                                       if ((di_param.m_command_order&4) && send_csw)
+                                               send_mask |= 1;
+                                       if (di_param.m_command_order==4 && send_burst)
+                                               send_mask |= 8;
+                               }
+                               if (changed_csw) 
                                {
-                                       send_diseqc = changed_csw;
-                                       if ( send_diseqc && di_param.m_use_fast && (csw & 0xF0) && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) )
-                                               send_diseqc = false;
+                                       if ( di_param.m_use_fast && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) )
+                                               eDebug("dont send committed cmd (fast diseqc)");
+                                       else
+                                       {
+                                               send_mask |= 1;
+                                               if (!(di_param.m_command_order&4) && send_ucsw)
+                                                       send_mask |= 2;
+                                               if (!(di_param.m_command_order&1) && send_burst)
+                                                       send_mask |= 8;
+                                       }
                                }
 
-                               if ( send_diseqc || changed_burst )
+#if 0
+                               eDebugNoNewLine("sendmask: ");
+                               for (int i=3; i >= 0; --i)
+                                       if ( send_mask & (1<<i) )
+                                               eDebugNoNewLine("1");
+                                       else
+                                               eDebugNoNewLine("0");
+                               eDebug("");
+#endif
+
+                               if ( send_mask )
                                {
                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
                                        eSecCommand::pair compare;
@@ -207,16 +390,22 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                        compare.steps = +3;
                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); 
+                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
                                }
 
-                               if ( send_diseqc )
+                               for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
                                {
+                                       if ( send_mask & 4 )
+                                       {
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                       }
+
                                        int loops=0;
 
-                                       if ( send_csw )
+                                       if ( send_mask & 1 )
                                                ++loops;
-                                       if ( send_ucsw )
+                                       if ( send_mask & 2 )
                                                ++loops;
 
                                        for ( int i=0; i < di_param.m_repeats; ++i )
@@ -228,13 +417,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                diseqc.len = 4;
                                                diseqc.data[0] = i ? 0xE1 : 0xE0;
                                                diseqc.data[1] = 0x10;
-
-                                               if ( !send_csw || (di_param.m_swap_cmds && send_ucsw) )
+                                               if ( (send_mask & 2) && (di_param.m_command_order & 4) )
                                                {
                                                        diseqc.data[2] = 0x39;
                                                        diseqc.data[3] = ucsw;
                                                }
-                                               else
+                                               else if ( send_mask & 1 )
                                                {
                                                        diseqc.data[2] = 0x38;
                                                        diseqc.data[3] = csw;
@@ -245,9 +433,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                if ( i < loops )
                                                {
                                                        int cmd=0;
-                                                       if (diseqc.data[2] == 0x38 && send_ucsw)
+                                                       if (diseqc.data[2] == 0x38 && (send_mask & 2))
                                                                cmd=0x39;
-                                                       else if (diseqc.data[2] == 0x39 && send_csw)
+                                                       else if (diseqc.data[2] == 0x39 && (send_mask & 1))
                                                                cmd=0x38;
                                                        if (cmd)
                                                        {
@@ -260,46 +448,37 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                if ( i < loops )
                                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
                                                                else
-                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
                                                        }
                                                        else  // delay 120msek when no command is in repeat gap
                                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 120) );
                                                }
                                                else
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                       }
 
-                                               frontend.setData(0, csw);
-                                               frontend.setData(1, ucsw);
+                                       if ( send_mask & 8 )  // toneburst at end of sequence
+                                       {
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
                                        }
                                }
-                               if ( (changed_burst || send_diseqc) && di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
-                               {
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );
-                                       frontend.setData(2, di_param.m_toneburst_param);
-                               }
+
                                if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
                                {
                                        int RotorCmd=0;
                                        bool useGotoXX = false;
 
-                                       std::map<int,int,eDVBSatelliteRotorParameters::Orbital_Position_Compare>::iterator it =
-                                               rotor_param.m_rotor_position_table.find( sat.orbital_position );
-
-                                       if (it != rotor_param.m_rotor_position_table.end())  // position for selected sat found ?
-                                               RotorCmd=it->second;
-                                       else  // entry not in table found
+                                       if (sw_param.m_rotorPosNum) // we have stored rotor pos?
+                                               RotorCmd=sw_param.m_rotorPosNum;
+                                       else  // we must calc gotoxx cmd
                                        {
-                                               eDebug("Entry for %d,%d° not in Rotor Table found... i try gotoXX°", sat.orbital_position / 10, sat.orbital_position % 10 );
+                                               eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
                                                useGotoXX = true;
 
-                                               int satDir = sat.orbital_position < 0 ?
-                                                       eDVBSatelliteRotorParameters::WEST :
-                                                       eDVBSatelliteRotorParameters::EAST;
-
                                                double  SatLon = abs(sat.orbital_position)/10.00,
-                                                               SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
-                                                               SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
+                                                               SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
+                                                               SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
 
                                                if ( rotor_param.m_gotoxx_parameters.m_la_direction == eDVBSatelliteRotorParameters::SOUTH )
                                                        SiteLat = -SiteLat;
@@ -307,9 +486,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
                                                        SiteLon = 360 - SiteLon;
 
-                                               if (satDir == eDVBSatelliteRotorParameters::WEST )
-                                                       SatLon = 360 - SatLon;
-
                                                eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
                                                double satHourAngle =
                                                        calcSatHourangle( SatLon, SiteLat, SiteLon );
@@ -347,22 +523,22 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                        }
                                        if ( RotorCmd != lastRotorCmd )
                                        {
-                                               if ( changed_burst || send_diseqc )
+                                               if ( send_mask )
                                                {
                                                        // override first voltage change
-                                                       *(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13);
+                                                       *(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13));
                                                        // wait 1 second after first switch diseqc command
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) );  
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) );
                                                }
                                                else  // no other diseqc commands before
                                                {
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );  // wait 50msec after voltage change
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );  // wait 15msec after tone change
                                                        eSecCommand::pair compare;
                                                        compare.voltage = voltage;
                                                        compare.steps = +3;
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
                                                }
 
@@ -390,10 +566,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO, +8) ); // already measured?
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 100) );  // wait 100msec before measure
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); // back to lower voltage
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // back to lower voltage
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
 ////////////////////////////
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
@@ -404,34 +580,51 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // 50msec delay
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
                                                        cmd.direction=1;  // check for running rotor
-                                                       cmd.deltaA=rotor_param.m_inputpower_parameters.m_threshold;
+                                                       cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;
                                                        cmd.steps=+3;
                                                        cmd.okcount=0;
                                                        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, +11 ) );  // timeout ?
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +9 ) );  // 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::SET_TIMEOUT, 2400) );  // 2 minutes running timeout
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
 // 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=+3;
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) );  // timeout ?
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) );  // timeout ? this should never happen
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-                                                       frontend.setData(3, RotorCmd);
-                                                       frontend.setData(4, sat.orbital_position);
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       if ( linked )
+                                                       {
+                                                               frontend.setData(5, RotorCmd);
+                                                               frontend.setData(6, sat.orbital_position);
+                                                       }
+                                                       else
+                                                       {
+                                                               frontend.setData(3, RotorCmd);
+                                                               frontend.setData(4, sat.orbital_position);
+                                                       }
                                                }
                                                else
                                                        eFatal("rotor turning without inputpowermeasure not implemented yet");
                                        }
                                }
                        }
+                       else
+                               csw = band;
+
+                       frontend.setData(0, csw);
+                       frontend.setData(1, ucsw);
+                       frontend.setData(2, di_param.m_toneburst_param);
+
+                       if ( linked )
+                               return 0;
 
                        eSecCommand::pair compare;
                        compare.voltage = voltage;
@@ -449,8 +642,309 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                }
        }
 
-       eDebug("not found satellite configuration for orbital position (%d)", sat.orbital_position );
+       if (linked)
+               return 0;
+
+       eDebug("found no satellite configuration for orbital position (%d)", sat.orbital_position );
+       return -1;
+}
+
+RESULT eDVBSatelliteEquipmentControl::clear()
+{
+       for (int i=0; i < m_lnbidx; ++i)
+       {
+               m_lnbs[i].m_satellites.clear();
+               m_lnbs[i].tuner_mask = 0;
+       }
+       m_lnbidx=-1;
+
+// 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;
+}
+
+/* LNB Specific Parameters */
+RESULT eDVBSatelliteEquipmentControl::addLNB()
+{
+       if ( m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)))
+               m_curSat=m_lnbs[++m_lnbidx].m_satellites.end();
+       else
+       {
+               eDebug("no more LNB free... cnt is %d", m_lnbidx);
+               return -ENOSPC;
+       }
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].tuner_mask = tunermask;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_lof_lo = lofl;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_lof_hi = lofh;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_lof_threshold = threshold;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_increased_voltage = onoff;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+/* DiSEqC Specific Parameters */
+RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_diseqc_mode = (eDVBSatelliteDiseqcParameters::t_diseqc_mode)diseqcmode;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_toneburst_param = (eDVBSatelliteDiseqcParameters::t_toneburst_param)toneburst;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_uncommitted_cmd = command;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_diseqc_parameters.m_seq_repeat = onoff;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+/* Rotor Specific Parameters */
+RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_longitude=longitude;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_latitude=latitude;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_lo_direction=direction;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_la_direction=direction;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_use=onoff;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
+{
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_delta=delta;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+/* Satellite Specific Parameters */
+RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
+{
+       if ( currentLNBValid() )
+       {
+               std::map<int, eDVBSatelliteSwitchParameters>::iterator it =
+                       m_lnbs[m_lnbidx].m_satellites.find(orbital_position);
+               if ( it == m_lnbs[m_lnbidx].m_satellites.end() )
+               {
+                       std::pair<std::map<int, eDVBSatelliteSwitchParameters>::iterator, bool > ret =
+                               m_lnbs[m_lnbidx].m_satellites.insert(
+                                       std::pair<int, eDVBSatelliteSwitchParameters>(orbital_position, eDVBSatelliteSwitchParameters())
+                               );
+                       if ( ret.second )
+                               m_curSat = ret.first;
+                       else
+                               return -ENOMEM;
+               }
+               else
+                       return -EEXIST;
+       }
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
+{
+       if ( currentLNBValid() && m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
+               m_curSat->second.m_voltage_mode = (eDVBSatelliteSwitchParameters::t_voltage_mode)mode;
+       else
+               return -ENOENT;
+       return 0;
 
+}
+
+RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
+{
+       if ( currentLNBValid() )
+       {
+               if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
+                       m_curSat->second.m_22khz_signal = (eDVBSatelliteSwitchParameters::t_22khz_signal)mode;
+               else
+                       return -EPERM;
+       }
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
+{
+       if ( currentLNBValid() )
+       {
+               if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
+                       m_curSat->second.m_rotorPosNum=rotor_pos_num;
+               else
+                       return -EPERM;
+       }
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
+{
+       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(7, (int)p2);  // this is evil..
+               p2->m_frontend->setData(7, (int)p1);
+               return 0;
+       }
        return -1;
 }
 
+bool eDVBSatelliteEquipmentControl::isRotorMoving()
+{
+       return m_rotorMoving;
+}
+
+void eDVBSatelliteEquipmentControl::setRotorMoving(bool b)
+{
+       m_rotorMoving=b;
+}