improove motor turning without power measure
[vuplus_dvbapp] / lib / dvb / sec.cpp
index 81008c7..dccffaf 100644 (file)
@@ -1,6 +1,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
+#include <lib/dvb/dvbtime.h>
 
 #include <set>
 
 #endif
 #include <lib/base/eerror.h>
 
+//#define SEC_DEBUG
+
+#ifdef SEC_DEBUG
+#define eSecDebug(arg...) eDebug(arg)
+#else
+#define eSecDebug(arg...)
+#endif
+
 DEFINE_REF(eDVBSatelliteEquipmentControl);
 
 eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
@@ -37,7 +46,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // ASTRA
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
        setLNBThreshold(11700000);
        setLNBLOFH(10607000);
@@ -54,7 +63,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // Hotbird
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
        setLNBThreshold(11700000);
        setLNBLOFH(10600000);
@@ -71,7 +80,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // Rotor
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
        setLNBThreshold(11700000);
        setLNBLOFH(10600000);
@@ -105,48 +114,7 @@ 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 eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
 {
        int ret=0, satcount=0;
 
@@ -154,7 +122,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
        {
                bool rotor=false;
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
-               if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner?
+               if ( lnb_param.slot_mask & slot_id ) // lnb for correct tuner?
                {
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 
@@ -164,7 +132,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                lnb_param.m_satellites.find(sat.orbital_position);
                        if ( sit != lnb_param.m_satellites.end())
                        {
-                               int band=0,
+                               long band=0,
                                        linked_prev_ptr=-1,
                                        linked_next_ptr=-1,
                                        satpos_depends_ptr=-1,
@@ -173,9 +141,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        toneburst = di_param.m_toneburst_param,
                                        curRotorPos;
 
-                               fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
                                fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
-                               fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
                                fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);
 
                                if ( sat.frequency > lnb_param.m_lof_threshold )
@@ -198,8 +164,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                rotor = true;
 
                                        ret=10000;
-                                       if (rotor && curRotorPos != -1)
-                                               ret -= abs(curRotorPos-sat.orbital_position);
                                }
                                else
                                {
@@ -207,11 +171,76 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        ret = 15000;
                                }
 
-                               while (ret && linked_prev_ptr != -1)  // check for linked tuners..
-                                       checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor);
+                               if (m_not_linked_slot_mask & slot_id)  // frontend with direct connection?
+                               {
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+                                       fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+                                       fe->getData(eDVBFrontend::CSW, ocsw);
+                                       fe->getData(eDVBFrontend::UCSW, oucsw);
+                                       fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+                                       while (ret && linked_prev_ptr != -1)  // check for linked tuners..
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               if (linked_fe->m_inuse)
+                                               {
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
+                                               }
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                       }
+                                       while (ret && linked_next_ptr != -1)  // check for linked tuners..
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
+                                               if (linked_fe->m_inuse)
+                                               {
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
+                                               }
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr);
+                                       }
+                               }
+                               else // linked frontend..
+                               {
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       while (linked_prev_ptr != -1)
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                               if (linked_prev_ptr == -1)
+                                               {
+                                                       iDVBFrontend *sec_fe = linked_fe->m_frontend;
+                                                       sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+                                                       if (linked_fe->m_inuse)
+                                                       {
+                                                               sec_fe->getData(eDVBFrontend::CSW, ocsw);
+                                                               sec_fe->getData(eDVBFrontend::UCSW, oucsw);
+                                                               sec_fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+                                                               if ( (csw != ocsw) ||
+                                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                                       ( rotor && curRotorPos != sat.orbital_position ) )
+                                                               {
+                                                                       ret=0;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
 
-                               while (ret && linked_next_ptr != -1)  // check for linked tuners..
-                                       checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor);
+                               if (ret && rotor && curRotorPos != -1)
+                                       ret -= abs(curRotorPos-sat.orbital_position);
 
                                if (ret)
                                        if (satpos_depends_ptr != -1)
@@ -219,16 +248,9 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
                                                if ( satpos_depends_to_fe->m_inuse )
                                                {
-                                                       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);
+                                                       if (!rotor || curRotorPos != sat.orbital_position)
                                                                ret=0;
-                                                       }
                                                }
-//                                             else
-//                                                     eDebug("OK .. can tune this transponder satpos is correct :)");
                                        }
 
                                if (ret)
@@ -236,33 +258,51 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        int lof = sat.frequency > lnb_param.m_lof_threshold ?
                                                lnb_param.m_lof_hi : lnb_param.m_lof_lo;
                                        int tuner_freq = abs(sat.frequency - lof);
-//                                     eDebug("tuner freq %d", tuner_freq);
                                        if (tuner_freq < 900000 || tuner_freq > 2200000)
-                                       {
                                                ret=0;
-//                                             eDebug("Transponder not tuneable with this lnb... %d Khz out of tuner range",
-//                                                     tuner_freq);
-                                       }
                                }
                        }
                }
        }
        if (ret && satcount)
                ret -= (satcount-1);
+       if (ret && m_not_linked_slot_mask & slot_id)
+               ret += 5; // increase score for tuners with direct sat connection
        return ret;
 }
 
+bool need_turn_fast(int turn_speed)
+{
+       if (turn_speed == eDVBSatelliteRotorParameters::FAST)
+               return true;
+       else if (turn_speed != eDVBSatelliteRotorParameters::SLOW)
+       {
+               int begin = turn_speed >> 16; // high word is start time
+               int end = turn_speed&0xFFFF; // low word is end time
+               time_t now_time = ::time(0);
+               tm nowTime;
+               localtime_r(&now_time, &nowTime);
+               int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1;
+               bool neg = end <= begin;
+               if (neg) {
+                       int tmp = begin;
+                       begin = end;
+                       end = tmp;
+               }
+               if ((now >= begin && now < end) ^ neg)
+                       return true;
+       }
+       return false;
+}
+
 #define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x)
 
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
 {
-       bool linked=false;
-       bool depend_satpos_mode=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?
+               if (!(lnb_param.slot_mask & slot_id)) // lnb for correct tuner?
                        continue;
                eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
                eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
@@ -272,12 +312,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                if ( sit != lnb_param.m_satellites.end())
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
-                       bool doSetVoltageToneFrontend = true;
                        bool doSetFrontend = true;
-                       int band=0,
-                               linked_prev_ptr=-1, // linked tuner
-                               linked_next_ptr=-1, // linked tuner
-                               satpos_depends_ptr=-1,
+                       bool doSetVoltageToneFrontend = true;
+                       bool allowDiseqc1_2 = true;
+                       long band=0,
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,
@@ -287,54 +325,32 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                lastucsw = -1,
                                lastToneburst = -1,
                                lastRotorCmd = -1,
-                               curRotorPos = -1;
-
-                       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);
-
-                       while (linked_prev_ptr != -1)  // check for linked tuners..
-                       {
-                               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);
-                       }
+                               curRotorPos = -1,
+                               satposDependPtr = -1;
+                       iDVBFrontend *sec_fe=&frontend;
 
-                       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);
-                               }
+                       frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);
 
-                       if (satpos_depends_ptr != -1)
+                       if (!(m_not_linked_slot_mask & slot_id))  // frontend with direct connection?
                        {
-                               eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
-                               if (satpos_fe->m_inuse)
+                               long linked_prev_ptr;
+                               frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+                               while (linked_prev_ptr != -1)
                                {
-                                       if ( di_param.m_diseqc_mode != eDVBSatelliteDiseqcParameters::V1_2 )
-                                               continue;
-                                       eDebug("[SEC] frontend is depending on satpos of other one.. so we dont turn rotor!!");
-                                       depend_satpos_mode=true;
+                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                       sec_fe = linked_fe->m_frontend;
+                                       sec_fe->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
                                }
+                               if (satposDependPtr != -1)
+                                       allowDiseqc1_2 = false;
                        }
 
+                       sec_fe->getData(eDVBFrontend::CSW, lastcsw);
+                       sec_fe->getData(eDVBFrontend::UCSW, lastucsw);
+                       sec_fe->getData(eDVBFrontend::TONEBURST, lastToneburst);
+                       sec_fe->getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd);
+                       sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+
                        if ( sat.frequency > lnb_param.m_lof_threshold )
                                band |= 1;
 
@@ -439,16 +455,13 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eDebugNoNewLine("0");
                                eDebug("");
 #endif
-
-                               int RotorCmd=-1;
-                               bool useGotoXX = false;
-                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
-                                       && !sat.no_rotor_command_on_tune )
+                               if (doSetVoltageToneFrontend)
                                {
-                                       if (depend_satpos_mode || linked)
-                                               // in this both modes we dont really turn the rotor.... but in canTune we need the satpos
-                                               frontend.setData(eDVBFrontend::ROTOR_POS, sat.orbital_position);
-                                       else
+                                       int RotorCmd=-1;
+                                       bool useGotoXX = false;
+                                       if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+                                               && !sat.no_rotor_command_on_tune
+                                               && allowDiseqc1_2 )
                                        {
                                                if (sw_param.m_rotorPosNum) // we have stored rotor pos?
                                                        RotorCmd=sw_param.m_rotorPosNum;
@@ -456,30 +469,30 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                {
                                                        eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
                                                        useGotoXX = true;
-
+       
                                                        double  SatLon = abs(sat.orbital_position)/10.00,
                                                                        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;
-
+       
                                                        if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
                                                                SiteLon = 360 - SiteLon;
-
+       
                                                        eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
                                                        double satHourAngle =
                                                                calcSatHourangle( SatLon, SiteLat, SiteLon );
                                                        eDebug("PolarmountHourAngle=%lf", satHourAngle );
-
+       
                                                        static int gotoXTable[10] =
                                                                { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
-
+       
                                                        if (SiteLat >= 0) // Northern Hemisphere
                                                        {
                                                                int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 );
                                                                RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-
+       
                                                                if (satHourAngle < 180) // the east
                                                                        RotorCmd |= 0xE000;
                                                                else                                    // west
@@ -503,276 +516,298 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        eDebug("RotorCmd = %04x", RotorCmd);
                                                }
                                        }
-                               }
 
-                               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, m_params[DELAY_AFTER_CONT_TONE]) );
-                                       compare.voltage = iDVBFrontend::voltageOff;
-                                       compare.steps = +3;
-                                       // 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 ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+                                       if ( send_mask )
                                        {
-                                               if (rotor_param.m_inputpower_parameters.m_use)
-                                                       compare.voltage = VOLTAGE(18);  // in input power mode set 18V for measure input power
-                                               else
-                                                       compare.voltage = VOLTAGE(13);  // in normal mode start turning with 13V
-                                       }
-                                       else
-                                               compare.voltage = voltage;
-
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-
-                                       // voltage was disabled..so we wait a longer time .. for normal switches 250ms should be enough
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
+                                               int vlt = iDVBFrontend::voltageOff;
+                                               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, m_params[DELAY_AFTER_CONT_TONE]) );
 
-                                       for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
-                                       {
-                                               if ( send_mask & 4 )
+                                               if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                                {
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
+                                                       if (rotor_param.m_inputpower_parameters.m_use)
+                                                               vlt = VOLTAGE(18);  // in input power mode set 18V for measure input power
+                                                       else
+                                                               vlt = VOLTAGE(13);  // in normal mode start turning with 13V
                                                }
+                                               else
+                                                       vlt = voltage;
+
+                                               // check if voltage is already correct..
+                                               compare.voltage = vlt;
+                                               compare.steps = +7;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 
-                                               int loops=0;
+                                               // check if voltage is disabled
+                                               compare.voltage = iDVBFrontend::voltageOff;
+                                               compare.steps = +5;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
 
-                                               if ( send_mask & 1 )
-                                                       ++loops;
-                                               if ( send_mask & 2 )
-                                                       ++loops;
+                                               // voltage is changed... use DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
 
-                                               loops <<= di_param.m_repeats;
+                                               // voltage was disabled.. use DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
 
-                                               for ( int i = 0; i < loops;)  // fill commands...
+                                               for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
                                                {
-                                                       eDVBDiseqcCommand diseqc;
-                                                       diseqc.len = 4;
-                                                       diseqc.data[0] = i ? 0xE1 : 0xE0;
-                                                       diseqc.data[1] = 0x10;
-                                                       if ( (send_mask & 2) && (di_param.m_command_order & 4) )
-                                                       {
-                                                               diseqc.data[2] = 0x39;
-                                                               diseqc.data[3] = ucsw;
-                                                       }
-                                                       else if ( send_mask & 1 )
-                                                       {
-                                                               diseqc.data[2] = 0x38;
-                                                               diseqc.data[3] = csw;
-                                                       }
-                                                       else  // no committed command confed.. so send uncommitted..
+                                                       if ( send_mask & 4 )
                                                        {
-                                                               diseqc.data[2] = 0x39;
-                                                               diseqc.data[3] = ucsw;
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
                                                        }
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
-                                                       i++;
-                                                       if ( i < loops )
+                                                       int loops=0;
+
+                                                       if ( send_mask & 1 )
+                                                               ++loops;
+                                                       if ( send_mask & 2 )
+                                                               ++loops;
+
+                                                       loops <<= di_param.m_repeats;
+
+                                                       for ( int i = 0; i < loops;)  // fill commands...
                                                        {
-                                                               int cmd=0;
-                                                               if (diseqc.data[2] == 0x38 && (send_mask & 2))
-                                                                       cmd=0x39;
-                                                               else if (diseqc.data[2] == 0x39 && (send_mask & 1))
-                                                                       cmd=0x38;
-                                                               int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
-                                                               if (cmd)
+                                                               eDVBDiseqcCommand diseqc;
+                                                               memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                                                               diseqc.len = 4;
+                                                               diseqc.data[0] = i ? 0xE1 : 0xE0;
+                                                               diseqc.data[1] = 0x10;
+                                                               if ( (send_mask & 2) && (di_param.m_command_order & 4) )
+                                                               {
+                                                                       diseqc.data[2] = 0x39;
+                                                                       diseqc.data[3] = ucsw;
+                                                               }
+                                                               else if ( send_mask & 1 )
                                                                {
-                                                                       int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // 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;
-                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                                                       ++i;
-                                                                       if ( i < loops )
-                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
-                                                                       else
-                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+                                                                       diseqc.data[2] = 0x38;
+                                                                       diseqc.data[3] = csw;
                                                                }
-                                                               else  // delay 120msek when no command is in repeat gap
-                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) );
+                                                               else  // no committed command confed.. so send uncommitted..
+                                                               {
+                                                                       diseqc.data[2] = 0x39;
+                                                                       diseqc.data[3] = ucsw;
+                                                               }
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+
+                                                               i++;
+                                                               if ( i < loops )
+                                                               {
+                                                                       int cmd=0;
+                                                                       if (diseqc.data[2] == 0x38 && (send_mask & 2))
+                                                                               cmd=0x39;
+                                                                       else if (diseqc.data[2] == 0x39 && (send_mask & 1))
+                                                                               cmd=0x38;
+                                                                       int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
+                                                                       if (cmd)
+                                                                       {
+                                                                               int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // 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;
+                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                                               ++i;
+                                                                               if ( i < loops )
+                                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
+                                                                               else
+                                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+                                                                       }
+                                                                       else  // delay 120msek when no command is in repeat gap
+                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) );
+                                                               }
+                                                               else
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
                                                        }
-                                                       else
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
-                                               }
 
-                                               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, m_params[DELAY_AFTER_TONEBURST]) );
+                                                       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, m_params[DELAY_AFTER_TONEBURST]) );
+                                                       }
                                                }
                                        }
-                               }
 
-                               if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
-                               {
-                                       eSecCommand::pair compare;
-                                       if (!send_mask)
+                                       eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
+                                       if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                        {
-                                               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, m_params[DELAY_AFTER_CONT_TONE]) );
-
-                                               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) );
+                                               eSecCommand::pair 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, m_params[DELAY_AFTER_CONT_TONE]) );
+
+                                                       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 (rotor_param.m_inputpower_parameters.m_use)
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // set 18V for measure input power
+                                                       else
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
 
-                                               if (rotor_param.m_inputpower_parameters.m_use)
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // set 18V for measure input power
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD]) ); // wait 750ms when voltage was disabled
+                                                       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::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
+
+                                               eDVBDiseqcCommand diseqc;
+                                               memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                                               diseqc.len = 3;
+                                               diseqc.data[0] = 0xE0;
+                                               diseqc.data[1] = 0x31;  // positioner
+                                               diseqc.data[2] = 0x60;  // stop
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_ROTORPOS_VALID_GOTO, +5) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                               // wait 150msec after send rotor stop cmd
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_MOTOR_STOP_CMD]) );
 
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD]) ); // wait 750ms when voltage was disabled
-                                               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::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
-
-                                       eDVBDiseqcCommand diseqc;
-                                       diseqc.len = 3;
-                                       diseqc.data[0] = 0xE0;
-                                       diseqc.data[1] = 0x31;  // positioner
-                                       diseqc.data[2] = 0x60;  // stop
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_ROTORPOS_VALID_GOTO, +5) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                       // wait 150msec after send rotor stop cmd
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_MOTOR_STOP_CMD]) );
-
-                                       diseqc.data[0] = 0xE0;
-                                       diseqc.data[1] = 0x31;          // positioner
-                                       if ( useGotoXX )
-                                       {
-                                               diseqc.len = 5;
-                                               diseqc.data[2] = 0x6E;  // drive to angular position
-                                               diseqc.data[3] = ((RotorCmd & 0xFF00) / 0x100);
-                                               diseqc.data[4] = RotorCmd & 0xFF;
-                                       }
-                                       else
-                                       {
-                                               diseqc.len = 4;
-                                               diseqc.data[2] = 0x6B;  // goto stored sat position
-                                               diseqc.data[3] = RotorCmd;
-                                               diseqc.data[4] = 0x00;
-                                       }
+                                               diseqc.data[0] = 0xE0;
+                                               diseqc.data[1] = 0x31;          // positioner
+                                               if ( useGotoXX )
+                                               {
+                                                       diseqc.len = 5;
+                                                       diseqc.data[2] = 0x6E;  // drive to angular position
+                                                       diseqc.data[3] = ((RotorCmd & 0xFF00) / 0x100);
+                                                       diseqc.data[4] = RotorCmd & 0xFF;
+                                               }
+                                               else
+                                               {
+                                                       diseqc.len = 4;
+                                                       diseqc.data[2] = 0x6B;  // goto stored sat position
+                                                       diseqc.data[3] = RotorCmd;
+                                                       diseqc.data[4] = 0x00;
+                                               }
 
-                                       if ( rotor_param.m_inputpower_parameters.m_use )
-                                       { // use measure rotor input power to detect rotor state
-                                               eSecCommand::rotor cmd;
-                                               eSecCommand::pair compare;
-                                               compare.voltage = VOLTAGE(18);
-                                               compare.steps = +3;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
+                                               if ( rotor_param.m_inputpower_parameters.m_use )
+                                               { // use measure rotor input power to detect rotor state
+                                                       bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
+                                                       eSecCommand::rotor cmd;
+                                                       eSecCommand::pair compare;
+                                                       compare.voltage = VOLTAGE(18);
+                                                       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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec after voltage change
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec before measure
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-                                               compare.val = 0;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec after voltage change
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec before measure
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 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) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, 2) );  // 2 retries
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) );  // 2 retries
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
 // rotor start loop
-                                               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_delta;
-                                               cmd.steps=+5;
-                                               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, +2 ) );  // timeout .. we assume now the rotor is already at the correct position
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // goto loop start
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +10 ) );  // timeout .. we assume now the rotor is already at the correct position
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) );  // goto loop start
+                                                       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_delta;
+                                                       cmd.steps=+5;
+                                                       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, +2 ) );  // timeout .. we assume now the rotor is already at the correct position
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // goto loop start
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, turn_fast ? 10 : 9 ) );  // timeout .. we assume now the rotor is already at the correct position 
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) );  // goto loop start
 ////////////////////
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) );  // 2 minutes running timeout
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+                                                       if (turn_fast)
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) );  // 2 minutes running timeout
 // rotor running loop
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
-                                               cmd.direction=0;  // check for stopped rotor
-                                               cmd.steps=+4;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +4 ) );  // timeout ? this should never happen
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
+                                                       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, +2 ) );  // timeout ? this should never happen
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-                                       }
-                                       else
-                                       {  // use normal turning mode
-                                               doSetVoltageToneFrontend=false;
-                                               doSetFrontend=false;
-                                               eSecCommand::rotor cmd;
-                                               eSecCommand::pair compare;
-                                               compare.voltage = VOLTAGE(13);
-                                               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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
-
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-
-                                               compare.voltage = voltage;
-                                               compare.steps = +3;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+                                               }
+                                               else
+                                               {  // use normal turning mode
+                                                       doSetVoltageToneFrontend=false;
+                                                       doSetFrontend=false;
+                                                       eSecCommand::rotor cmd;
+                                                       eSecCommand::pair compare;
+                                                       compare.voltage = VOLTAGE(13);
+                                                       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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
+
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
-                                               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, m_params[DELAY_AFTER_CONT_TONE]) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
-
-                                               cmd.direction=1;  // check for running rotor
-                                               cmd.deltaA=0;
-                                               cmd.steps=+3;
-                                               cmd.okcount=0;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*4) );  // 2 minutes running timeout
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );  // 250msec delay
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TUNER_LOCKED_GOTO, cmd ) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); 
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) );  // goto loop start
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       compare.voltage = voltage;
+                                                       compare.steps = +3;
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
+                                                       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, m_params[DELAY_AFTER_CONT_TONE]) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+
+                                                       cmd.direction=1;  // check for running rotor
+                                                       cmd.deltaA=0;
+                                                       cmd.steps=+3;
+                                                       cmd.okcount=0;
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*4) );  // 2 minutes running timeout
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );  // 250msec delay
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TUNER_LOCKED_GOTO, cmd ) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); 
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) );  // goto loop start
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+                                               }
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
                                        }
-                                       frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
-                                       frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
                                }
                        }
                        else
+                       {
+                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
                                csw = band;
+                       }
 
-                       frontend.setData(eDVBFrontend::CSW, csw);
-                       frontend.setData(eDVBFrontend::UCSW, ucsw);
-                       frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
+                       sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
+                       sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
+                       sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 
-                       if (!linked && doSetVoltageToneFrontend)
+                       if (doSetVoltageToneFrontend)
                        {
                                eSecCommand::pair compare;
                                compare.voltage = voltage;
@@ -786,9 +821,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
                        }
 
+                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
+
                        if (doSetFrontend)
                        {
-                               sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
                        }
                        frontend.setSecSequence(sec_sequence);
@@ -803,19 +840,36 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 RESULT eDVBSatelliteEquipmentControl::clear()
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::clear()");
        for (int i=0; i <= m_lnbidx; ++i)
        {
                m_lnbs[i].m_satellites.clear();
-               m_lnbs[i].tuner_mask = 0;
+               m_lnbs[i].slot_mask = 0;
        }
        m_lnbidx=-1;
 
-// clear linked tuner configuration
+       m_not_linked_slot_mask=0;
+
+       //reset some tuner configuration
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
+               long tmp;
+               if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
+               {
+                       FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+                       if (!f || fwrite("B", 1, 1, f) != 1)
+                               eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)");
+                       else
+                       {
+                               eDebug("set /proc/stb/tsmux/lnb_b_input to B OK");
+                               fclose(f);
+                       }
+               }
                it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1);
                it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1);
                it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1);
+               it->m_frontend->setData(eDVBFrontend::ROTOR_POS, -1);
+               it->m_frontend->setData(eDVBFrontend::ROTOR_CMD, -1);
        }
 
        return 0;
@@ -831,13 +885,15 @@ RESULT eDVBSatelliteEquipmentControl::addLNB()
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }
+       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
        return 0;
 }
 
-RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
+RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask);
        if ( currentLNBValid() )
-               m_lnbs[m_lnbidx].tuner_mask = tunermask;
+               m_lnbs[m_lnbidx].slot_mask = slotmask;
        else
                return -ENOENT;
        return 0;
@@ -845,6 +901,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFL(%d)", lofl);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_lo = lofl;
        else
@@ -854,6 +911,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFH(%d)", lofh);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_hi = lofh;
        else
@@ -863,6 +921,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBThreshold(%d)", threshold);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_threshold = threshold;
        else
@@ -872,6 +931,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_increased_voltage = onoff;
        else
@@ -882,6 +942,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 /* DiSEqC Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setDiSEqcMode(%d)", diseqcmode);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_diseqc_mode = (eDVBSatelliteDiseqcParameters::t_diseqc_mode)diseqcmode;
        else
@@ -891,6 +952,7 @@ RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setToneburst(%d)", toneburst);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_toneburst_param = (eDVBSatelliteDiseqcParameters::t_toneburst_param)toneburst;
        else
@@ -900,6 +962,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 
 RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setRepeats(%d)", repeats);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats;
        else
@@ -909,6 +972,7 @@ RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 
 RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setCommittedCommand(%d)", command);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command;
        else
@@ -918,6 +982,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setUncommittedCommand(%d)", command);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_uncommitted_cmd = command;
        else
@@ -927,6 +992,7 @@ RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setCommandOrder(%d)", order);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order;
        else
@@ -936,6 +1002,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 
 RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setFastDiSEqc(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff;
        else
@@ -945,6 +1012,7 @@ RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setSeqRepeat(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_seq_repeat = onoff;
        else
@@ -955,6 +1023,7 @@ RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
 /* Rotor Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLongitude(%f)", longitude);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_longitude=longitude;
        else
@@ -964,6 +1033,7 @@ RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLatitude(%f)", latitude);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_latitude=latitude;
        else
@@ -973,6 +1043,7 @@ RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLoDirection(%d)", direction);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_lo_direction=direction;
        else
@@ -982,6 +1053,7 @@ RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLaDirection(%d)", direction);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_la_direction=direction;
        else
@@ -991,6 +1063,7 @@ RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setUseInputpower(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_use=onoff;
        else
@@ -1000,6 +1073,7 @@ RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setInputpowerDelta(%d)", delta);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_delta=delta;
        else
@@ -1010,6 +1084,7 @@ RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::addSatellite(%d)", orbital_position);
        if ( currentLNBValid() )
        {
                std::map<int, eDVBSatelliteSwitchParameters>::iterator it =
@@ -1035,6 +1110,7 @@ RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 
 RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setVoltageMode(%d)", mode);
        if ( currentLNBValid() && m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
                m_curSat->second.m_voltage_mode = (eDVBSatelliteSwitchParameters::t_voltage_mode)mode;
        else
@@ -1045,6 +1121,7 @@ RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setToneMode(%d)", mode);
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
@@ -1059,6 +1136,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setRotorPosNum(%d)", rotor_pos_num);
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
@@ -1071,6 +1149,16 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
        return 0;
 }
 
+RESULT eDVBSatelliteEquipmentControl::setRotorTurningSpeed(int speed)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setRotorTurningSpeed(%d)", speed);
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_turning_speed = speed;
+       else
+               return -ENOENT;
+       return 0;
+}
+
 struct sat_compare
 {
        int orb_pos, lofl, lofh;
@@ -1096,129 +1184,35 @@ struct sat_compare
        }
 };
 
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
+RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
-       ePyObject ret;
-
+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
        if (tu1 != tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-               int cnt=0;
-               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+
+               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
                {
-                       if (cnt == tu1)
+                       if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;
-                       else if (cnt == tu2)
+                       else if (it->m_frontend->getSlotID() == tu2)
                                p2 = *it;
                }
-
                if (p1 && p2)
                {
-                       // check for linked tuners
-
-                       do 
-                       {
-                               int tmp;
-                               p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p1 = (eDVBRegisteredFrontend*)tmp;
-                               else
-                                       break;
-                       }
-                       while (true);
-
-                       do 
+                       p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
+                       p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
+                       if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)"))
                        {
-                               int tmp;
-                               p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p2 = (eDVBRegisteredFrontend*)tmp;
+                               FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+                               if (!f || fwrite("A", 1, 1, f) != 1)
+                                       eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)");
                                else
-                                       break;
-                       }
-                       while (true);
-
-                       if (p1 != p2)
-                       {
-                               int tmp1=-1;
-                               int tmp2=-1;
-                               // check for rotor dependency
-                               p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
-                               if (tmp1 != -1)
-                                       p1 = (eDVBRegisteredFrontend*)tmp1;
-                               p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
-                               if (tmp2 != -1)
-                                       p2 = (eDVBRegisteredFrontend*)tmp2;
-                               if (p1 != p2)
                                {
-                                       int tu1_mask = 1 << p1->m_frontend->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));
-                                       }
+                                       eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
+                                       fclose(f);
                                }
                        }
-               }
-       }
-       if (!ret)
-       {
-               ret = PyList_New(2);
-               PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
-               PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
-       }
-       return ret;
-}
-
-RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
-{
-       if (tu1 != tu2)
-       {
-               eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-
-               int cnt=0;
-               for (eSmartPtrList<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;
                }
        }
@@ -1227,28 +1221,34 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 
 RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerDepends(%d, %d)", tu1, tu2);
        if (tu1 == tu2)
                return -1;
 
        eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
 
-       int cnt=0;
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
-               if (cnt == tu1)
+               if (it->m_frontend->getSlotID() == tu1)
                        p1 = *it;
-               else if (cnt == tu2)
+               else if (it->m_frontend->getSlotID() == tu2)
                        p2 = *it;
        }
        if (p1 && p2)
        {
-               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p2);
-               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p1);
+               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
                return 0;
        }
        return -1;
 }
 
+void eDVBSatelliteEquipmentControl::setSlotNotLinked(int slot_no)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setSlotNotLinked(%d)", slot_no);
+       m_not_linked_slot_mask |= (1 << slot_no);
+}
+
 bool eDVBSatelliteEquipmentControl::isRotorMoving()
 {
        return m_rotorMoving;