frontend.cpp: 4505 and 4506 use the same snrdb calculation

[enigma2.git] / lib / dvb / frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index c8d6d15fe074879200f0f49b5285162c56c8ba5a..15a46db83b66ed2139301c4987be154d75e819a2 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1,4 +1,5 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/dvb.h>

+#include <lib/dvb/frontendparms.h>

 #include <lib/base/eerror.h>
 #include <lib/base/nconfig.h> // access to python config
 #include <errno.h>
 #include <lib/base/eerror.h>
 #include <lib/base/nconfig.h> // access to python config
 #include <errno.h>


@@ -48,9 +49,7 @@
 #define parm_u_ofdm_transmission_mode parm.u.ofdm.transmission_mode
 #define parm_u_ofdm_guard_interval parm.u.ofdm.guard_interval
 #define parm_u_ofdm_hierarchy_information parm.u.ofdm.hierarchy_information
 #define parm_u_ofdm_transmission_mode parm.u.ofdm.transmission_mode
 #define parm_u_ofdm_guard_interval parm.u.ofdm.guard_interval
 #define parm_u_ofdm_hierarchy_information parm.u.ofdm.hierarchy_information

-#ifdef FEC_9_10
-       #warning "FEC_9_10 already exist in dvb api ... it seems it is now ready for DVB-S2"
-#else
+#if HAVE_DVB_API_VERSION < 5

        #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_AUTO+1)
        #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_S2_QPSK_1_2+1)
        #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_S2_QPSK_2_3+1)
        #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_AUTO+1)
        #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_S2_QPSK_1_2+1)
        #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_S2_QPSK_2_3+1)


@@ -69,6 +68,16 @@
        #define FEC_S2_8PSK_3_5 (fe_code_rate_t)(FEC_S2_8PSK_8_9+1)
        #define FEC_S2_8PSK_4_5 (fe_code_rate_t)(FEC_S2_8PSK_3_5+1)
        #define FEC_S2_8PSK_9_10 (fe_code_rate_t)(FEC_S2_8PSK_4_5+1)
        #define FEC_S2_8PSK_3_5 (fe_code_rate_t)(FEC_S2_8PSK_8_9+1)
        #define FEC_S2_8PSK_4_5 (fe_code_rate_t)(FEC_S2_8PSK_3_5+1)
        #define FEC_S2_8PSK_9_10 (fe_code_rate_t)(FEC_S2_8PSK_4_5+1)

+#else
+       #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_1_2)
+       #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_2_3)
+       #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_3_4)
+       #define FEC_S2_QPSK_5_6 (fe_code_rate_t)(FEC_5_6)
+       #define FEC_S2_QPSK_7_8 (fe_code_rate_t)(FEC_7_8)
+       #define FEC_S2_QPSK_8_9 (fe_code_rate_t)(FEC_8_9)
+       #define FEC_S2_QPSK_3_5 (fe_code_rate_t)(FEC_3_5)
+       #define FEC_S2_QPSK_4_5 (fe_code_rate_t)(FEC_4_5)
+       #define FEC_S2_QPSK_9_10 (fe_code_rate_t)(FEC_9_10)

 #endif
 #endif
 
 #endif
 #endif
 


@@ -76,6 +85,32 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 

+#define eDebugNoSimulate(x...) \
+       do { \
+               if (!m_simulate) \
+                       eDebug(x); \
+       } while(0)
+#if 0
+               else \
+               { \
+                       eDebugNoNewLine("SIMULATE:"); \
+                       eDebug(x); \
+               }
+#endif
+
+#define eDebugNoSimulateNoNewLine(x...) \
+       do { \
+               if (!m_simulate) \
+                       eDebugNoNewLine(x); \
+       } while(0)
+#if 0
+               else \
+               { \
+                       eDebugNoNewLine("SIMULATE:"); \
+                       eDebugNoNewLine(x); \
+               }
+#endif
+

 void eDVBDiseqcCommand::setCommandString(const char *str)
 {
        if (!str)
 void eDVBDiseqcCommand::setCommandString(const char *str)
 {
        if (!str)


@@ -122,9 +157,10 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
        symbol_rate  = descriptor.getSymbolRate() * 100;
        polarisation = descriptor.getPolarization();
        fec = descriptor.getFecInner();
        symbol_rate  = descriptor.getSymbolRate() * 100;
        polarisation = descriptor.getPolarization();
        fec = descriptor.getFecInner();

-       if ( fec != FEC::fNone && fec > FEC::f9_10 )
-               fec = FEC::fAuto;
-       inversion = Inversion::Unknown;
+       if ( fec != eDVBFrontendParametersSatellite::FEC_None && fec > eDVBFrontendParametersSatellite::FEC_9_10 )
+               fec = eDVBFrontendParametersSatellite::FEC_Auto;
+       inversion = eDVBFrontendParametersSatellite::Inversion_Unknown;
+       pilot = eDVBFrontendParametersSatellite::Pilot_Unknown;

        orbital_position  = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
        orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
        orbital_position += ((descriptor.getOrbitalPosition() >> 4) & 0xF) * 10;
        orbital_position  = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
        orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
        orbital_position += ((descriptor.getOrbitalPosition() >> 4) & 0xF) * 10;


@@ -133,21 +169,21 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
                orbital_position = 3600 - orbital_position;
        system = descriptor.getModulationSystem();
        modulation = descriptor.getModulation();
                orbital_position = 3600 - orbital_position;
        system = descriptor.getModulationSystem();
        modulation = descriptor.getModulation();

-       if (system == System::DVB_S && modulation == Modulation::M8PSK)
+       if (system == eDVBFrontendParametersSatellite::System_DVB_S && modulation == eDVBFrontendParametersSatellite::Modulation_8PSK)

        {
                eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK");
        {
                eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK");

-               modulation=QPSK;
+               modulation=eDVBFrontendParametersSatellite::Modulation_QPSK;

        }
        }

-       roll_off = descriptor.getRollOff();
-       if (system == System::DVB_S2)
+       rolloff = descriptor.getRollOff();
+       if (system == eDVBFrontendParametersSatellite::System_DVB_S2)

        {
        {

-               eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, roll_off %d",
+               eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, rolloff %d",

                        frequency,
                        polarisation ? "hor" : "vert",
                        orbital_position,
                        symbol_rate, fec,
                        modulation,
                        frequency,
                        polarisation ? "hor" : "vert",
                        orbital_position,
                        symbol_rate, fec,
                        modulation,

-                       roll_off);
+                       rolloff);

        }
        else
        {
        }
        else
        {


@@ -164,12 +200,12 @@ void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descr
        frequency = descriptor.getFrequency() / 10;
        symbol_rate = descriptor.getSymbolRate() * 100;
        fec_inner = descriptor.getFecInner();
        frequency = descriptor.getFrequency() / 10;
        symbol_rate = descriptor.getSymbolRate() * 100;
        fec_inner = descriptor.getFecInner();

-       if ( fec_inner == 0xF )
-               fec_inner = FEC::fNone;
+       if ( fec_inner != eDVBFrontendParametersCable::FEC_None && fec_inner > eDVBFrontendParametersCable::FEC_8_9 )
+               fec_inner = eDVBFrontendParametersCable::FEC_Auto;

        modulation = descriptor.getModulation();
        if ( modulation > 0x5 )
        modulation = descriptor.getModulation();
        if ( modulation > 0x5 )

-               modulation = Modulation::Auto;
-       inversion = Inversion::Unknown;
+               modulation = eDVBFrontendParametersCable::Modulation_Auto;
+       inversion = eDVBFrontendParametersCable::Inversion_Unknown;

        eDebug("Cable freq %d, mod %d, sr %d, fec %d",
                frequency,
                modulation, symbol_rate, fec_inner);
        eDebug("Cable freq %d, mod %d, sr %d, fec %d",
                frequency,
                modulation, symbol_rate, fec_inner);


@@ -180,30 +216,31 @@ void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescr
        frequency = descriptor.getCentreFrequency() * 10;
        bandwidth = descriptor.getBandwidth();
        if ( bandwidth > 2 ) // 5Mhz forced to auto
        frequency = descriptor.getCentreFrequency() * 10;
        bandwidth = descriptor.getBandwidth();
        if ( bandwidth > 2 ) // 5Mhz forced to auto

-               bandwidth = Bandwidth::BwAuto;
+               bandwidth = eDVBFrontendParametersTerrestrial::Bandwidth_Auto;

        code_rate_HP = descriptor.getCodeRateHpStream();
        if (code_rate_HP > 4)
        code_rate_HP = descriptor.getCodeRateHpStream();
        if (code_rate_HP > 4)

-               code_rate_HP = FEC::fAuto;
+               code_rate_HP = eDVBFrontendParametersTerrestrial::FEC_Auto;

        code_rate_LP = descriptor.getCodeRateLpStream();
        if (code_rate_LP > 4)
        code_rate_LP = descriptor.getCodeRateLpStream();
        if (code_rate_LP > 4)

-               code_rate_LP = FEC::fAuto;
+               code_rate_LP = eDVBFrontendParametersTerrestrial::FEC_Auto;

        transmission_mode = descriptor.getTransmissionMode();
        if (transmission_mode > 1) // TM4k forced to auto
        transmission_mode = descriptor.getTransmissionMode();
        if (transmission_mode > 1) // TM4k forced to auto

-               transmission_mode = TransmissionMode::TMAuto;
+               transmission_mode = eDVBFrontendParametersTerrestrial::TransmissionMode_Auto;

        guard_interval = descriptor.getGuardInterval();
        if (guard_interval > 3)
        guard_interval = descriptor.getGuardInterval();
        if (guard_interval > 3)

-               guard_interval = GuardInterval::GI_Auto;
+               guard_interval = eDVBFrontendParametersTerrestrial::GuardInterval_Auto;

        hierarchy = descriptor.getHierarchyInformation()&3;
        modulation = descriptor.getConstellation();
        if (modulation > 2)
        hierarchy = descriptor.getHierarchyInformation()&3;
        modulation = descriptor.getConstellation();
        if (modulation > 2)

-               modulation = Modulation::Auto;
-       inversion = Inversion::Unknown;
+               modulation = eDVBFrontendParametersTerrestrial::Modulation_Auto;
+       inversion = eDVBFrontendParametersTerrestrial::Inversion_Unknown;

        eDebug("Terr freq %d, bw %d, cr_hp %d, cr_lp %d, tm_mode %d, guard %d, hierarchy %d, const %d",
                frequency, bandwidth, code_rate_HP, code_rate_LP, transmission_mode,
                guard_interval, hierarchy, modulation);
 }
 
        eDebug("Terr freq %d, bw %d, cr_hp %d, cr_lp %d, tm_mode %d, guard %d, hierarchy %d, const %d",
                frequency, bandwidth, code_rate_HP, code_rate_LP, transmission_mode,
                guard_interval, hierarchy, modulation);
 }
 

-eDVBFrontendParameters::eDVBFrontendParameters(): m_type(-1)
+eDVBFrontendParameters::eDVBFrontendParameters()
+       :m_type(-1), m_flags(0)

 {
 }
 
 {
 }
 


@@ -288,9 +325,9 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
                        diff = 1<<29;
                else if (sat.polarisation != osat.polarisation)
                        diff = 1<<28;
                        diff = 1<<29;
                else if (sat.polarisation != osat.polarisation)
                        diff = 1<<28;

-               else if (exact && sat.fec != osat.fec && sat.fec != eDVBFrontendParametersSatellite::FEC::fAuto && osat.fec != eDVBFrontendParametersSatellite::FEC::fAuto)
+               else if (exact && sat.fec != osat.fec && sat.fec != eDVBFrontendParametersSatellite::FEC_Auto && osat.fec != eDVBFrontendParametersSatellite::FEC_Auto)

                        diff = 1<<27;
                        diff = 1<<27;

-               else if (exact && sat.modulation != osat.modulation && sat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto && osat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto)
+               else if (exact && sat.modulation != osat.modulation && sat.modulation != eDVBFrontendParametersSatellite::Modulation_Auto && osat.modulation != eDVBFrontendParametersSatellite::Modulation_Auto)

                        diff = 1<<27;
                else
                {
                        diff = 1<<27;
                else
                {


@@ -305,10 +342,10 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
                        return -2;
 
                if (exact && cable.modulation != ocable.modulation
                        return -2;
 
                if (exact && cable.modulation != ocable.modulation

-                       && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto
-                       && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto)
+                       && cable.modulation != eDVBFrontendParametersCable::Modulation_Auto
+                       && ocable.modulation != eDVBFrontendParametersCable::Modulation_Auto)

                        diff = 1 << 29;
                        diff = 1 << 29;

-               else if (exact && cable.fec_inner != ocable.fec_inner && cable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto && ocable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto)
+               else if (exact && cable.fec_inner != ocable.fec_inner && cable.fec_inner != eDVBFrontendParametersCable::FEC_Auto && ocable.fec_inner != eDVBFrontendParametersCable::FEC_Auto)

                        diff = 1 << 27;
                else
                {
                        diff = 1 << 27;
                else
                {


@@ -321,37 +358,36 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
                if (parm->getDVBT(oterrestrial))
                        return -2;
 
                if (parm->getDVBT(oterrestrial))
                        return -2;
 

-

                if (exact && oterrestrial.bandwidth != terrestrial.bandwidth &&
                if (exact && oterrestrial.bandwidth != terrestrial.bandwidth &&

-                       oterrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto &&
-                       terrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto)
+                       oterrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth_Auto &&
+                       terrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.modulation != terrestrial.modulation &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.modulation != terrestrial.modulation &&

-                       oterrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto &&
-                       terrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto)
+                       oterrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation_Auto &&
+                       terrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.transmission_mode != terrestrial.transmission_mode &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.transmission_mode != terrestrial.transmission_mode &&

-                       oterrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto &&
-                       terrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto)
+                       oterrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode_Auto &&
+                       terrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.guard_interval != terrestrial.guard_interval &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.guard_interval != terrestrial.guard_interval &&

-                       oterrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto &&
-                       terrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto)
+                       oterrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval_Auto &&
+                       terrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.hierarchy != terrestrial.hierarchy &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.hierarchy != terrestrial.hierarchy &&

-                       oterrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto &&
-                       terrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto)
+                       oterrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy_Auto &&
+                       terrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.code_rate_LP != terrestrial.code_rate_LP &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.code_rate_LP != terrestrial.code_rate_LP &&

-                       oterrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto &&
-                       terrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto)
+                       oterrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC_Auto &&
+                       terrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC_Auto)

                        diff = 1 << 30;
                else if (exact && oterrestrial.code_rate_HP != terrestrial.code_rate_HP &&
                        diff = 1 << 30;
                else if (exact && oterrestrial.code_rate_HP != terrestrial.code_rate_HP &&

-                       oterrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto &&
-                       terrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto)
+                       oterrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC_Auto &&
+                       terrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC_Auto)

                        diff = 1 << 30;
                else
                        diff = 1 << 30;
                else

-                       diff = abs(terrestrial.frequency - oterrestrial.frequency);
+                       diff = abs(terrestrial.frequency - oterrestrial.frequency) / 1000;

                return 0;
        default:
                return -1;
                return 0;
        default:
                return -1;


@@ -371,9 +407,42 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
        }
        case iDVBFrontend::feCable:
                hash = 0xFFFF0000;
        }
        case iDVBFrontend::feCable:
                hash = 0xFFFF0000;

+               hash |= (cable.frequency/1000)&0xFFFF;

                return 0;
        case iDVBFrontend::feTerrestrial:
                hash = 0xEEEE0000;
                return 0;
        case iDVBFrontend::feTerrestrial:
                hash = 0xEEEE0000;

+               hash |= (terrestrial.frequency/1000000)&0xFFFF;
+               return 0;
+       default:
+               return -1;
+       }
+}
+
+RESULT eDVBFrontendParameters::calcLockTimeout(unsigned int &timeout) const
+{
+       switch (m_type)
+       {
+       case iDVBFrontend::feSatellite:
+       {
+                       /* high symbol rate transponders tune faster, due to 
+                               requiring less zigzag and giving more symbols faster. 
+
+                               5s are definitely not enough on really low SR when
+                               zigzag has to find the exact frequency first.
+                       */
+               if (sat.symbol_rate > 20000000)
+                       timeout = 5000;
+               else if (sat.symbol_rate > 10000000)
+                       timeout = 10000;
+               else
+                       timeout = 20000;
+               return 0;
+       }
+       case iDVBFrontend::feCable:
+               timeout = 5000;
+               return 0;
+       case iDVBFrontend::feTerrestrial:
+               timeout = 5000;

                return 0;
        default:
                return -1;
                return 0;
        default:
                return -1;


@@ -384,9 +453,10 @@ DEFINE_REF(eDVBFrontend);
 
 int eDVBFrontend::PriorityOrder=0;
 
 
 int eDVBFrontend::PriorityOrder=0;
 

-eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
-       :m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe)
-       ,m_fd(-1), m_need_rotor_workaround(false), m_sn(0), m_timeout(0), m_tuneTimer(0)
+eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
+       :m_simulate(simulate), m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe)
+       ,m_fd(-1), m_need_rotor_workaround(false), m_can_handle_dvbs2(false)
+       ,m_state(stateClosed), m_timeout(0), m_tuneTimer(0)

 #if HAVE_DVB_API_VERSION < 3
        ,m_secfd(-1)
 #endif
 #if HAVE_DVB_API_VERSION < 3
        ,m_secfd(-1)
 #endif


@@ -397,10 +467,11 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
 #else
        sprintf(m_filename, "/dev/dvb/adapter%d/frontend%d", adap, fe);
 #endif
 #else
        sprintf(m_filename, "/dev/dvb/adapter%d/frontend%d", adap, fe);
 #endif

-       m_timeout = new eTimer(eApp);
+
+       m_timeout = eTimer::create(eApp);

        CONNECT(m_timeout->timeout, eDVBFrontend::timeout);
 
        CONNECT(m_timeout->timeout, eDVBFrontend::timeout);
 

-       m_tuneTimer = new eTimer(eApp);
+       m_tuneTimer = eTimer::create(eApp);

        CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
 
        for (int i=0; i<eDVBFrontend::NUM_DATA_ENTRIES; ++i)
        CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
 
        for (int i=0; i<eDVBFrontend::NUM_DATA_ENTRIES; ++i)


@@ -414,10 +485,10 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
 
 int eDVBFrontend::openFrontend()
 {
 
 int eDVBFrontend::openFrontend()
 {

-       if (m_sn)
+       if (m_state != stateClosed)

                return -1;  // already opened
 
                return -1;  // already opened
 

-       m_state=0;
+       m_state=stateIdle;

        m_tuning=0;
 
 #if HAVE_DVB_API_VERSION < 3
        m_tuning=0;
 
 #if HAVE_DVB_API_VERSION < 3


@@ -425,14 +496,17 @@ int eDVBFrontend::openFrontend()
 #else
        dvb_frontend_info fe_info;
 #endif
 #else
        dvb_frontend_info fe_info;
 #endif

-       eDebug("opening frontend %d", m_dvbid);
+       eDebugNoSimulate("opening frontend %d", m_dvbid);

        if (m_fd < 0)
        {
        if (m_fd < 0)
        {

-               m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
-               if (m_fd < 0)
+               if (!m_simulate || m_type == -1)

                {
                {

-                       eWarning("failed! (%s) %m", m_filename);
-                       return -1;
+                       m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
+                       if (m_fd < 0)
+                       {
+                               eWarning("failed! (%s) %m", m_filename);
+                               return -1;
+                       }

                }
        }
        else
                }
        }
        else


@@ -464,7 +538,7 @@ int eDVBFrontend::openFrontend()
                        m_fd = -1;
                        return -1;
                }
                        m_fd = -1;
                        return -1;
                }

-               eDebug("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);
+               eDebugNoSimulate("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);

        }
 
 #if HAVE_DVB_API_VERSION < 3
        }
 
 #if HAVE_DVB_API_VERSION < 3


@@ -472,13 +546,16 @@ int eDVBFrontend::openFrontend()
        {
                        if (m_secfd < 0)
                        {
        {
                        if (m_secfd < 0)
                        {

-                               m_secfd = ::open(m_sec_filename, O_RDWR);
-                               if (m_secfd < 0)
+                               if (!m_simulate)

                                {
                                {

-                                       eWarning("failed! (%s) %m", m_sec_filename);
-                                       ::close(m_fd);
-                                       m_fd=-1;
-                                       return -1;
+                                       m_secfd = ::open(m_sec_filename, O_RDWR);
+                                       if (m_secfd < 0)
+                                       {
+                                               eWarning("failed! (%s) %m", m_sec_filename);
+                                               ::close(m_fd);
+                                               m_fd=-1;
+                                               return -1;
+                                       }

                                }
                        }
                        else
                                }
                        }
                        else


@@ -489,38 +566,54 @@ int eDVBFrontend::openFrontend()
        setTone(iDVBFrontend::toneOff);
        setVoltage(iDVBFrontend::voltageOff);
 
        setTone(iDVBFrontend::toneOff);
        setVoltage(iDVBFrontend::voltageOff);
 

-       m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
-       CONNECT(m_sn->activated, eDVBFrontend::feEvent);
+       if (!m_simulate)
+       {
+               m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Read, false);
+               CONNECT(m_sn->activated, eDVBFrontend::feEvent);
+       }

 
        return 0;
 }
 
 
        return 0;
 }
 

-int eDVBFrontend::closeFrontend()
+int eDVBFrontend::closeFrontend(bool force)

 {
 {

-       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_NEXT_PTR];
-       while (linked_fe != (eDVBRegisteredFrontend*)-1)
+       if (!force && m_data[CUR_VOLTAGE] != -1 && m_data[CUR_VOLTAGE] != iDVBFrontend::voltageOff)

        {
        {

-               if (linked_fe->m_inuse)
+               long tmp = m_data[LINKED_NEXT_PTR];
+               while (tmp != -1)

                {
                {

-                       eDebug("dont close frontend %d until the linked frontend %d in slot %d is still in use",
-                               m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
-                       return -1;
+                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+                       if (linked_fe->m_inuse)
+                       {
+                               eDebugNoSimulate("dont close frontend %d until the linked frontend %d in slot %d is still in use",
+                                       m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
+                               return -1;
+                       }
+                       linked_fe->m_frontend->getData(LINKED_NEXT_PTR, tmp);

                }
                }

-               linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (int&)linked_fe);

        }
        }

+

        if (m_fd >= 0)
        {
        if (m_fd >= 0)
        {

-               eDebug("close frontend %d", m_dvbid);
-               m_tuneTimer->stop();
+               eDebugNoSimulate("close frontend %d", m_dvbid);
+               if (m_data[SATCR] != -1)
+               {
+                       turnOffSatCR(m_data[SATCR]);
+               }

                setTone(iDVBFrontend::toneOff);
                setVoltage(iDVBFrontend::voltageOff);
                setTone(iDVBFrontend::toneOff);
                setVoltage(iDVBFrontend::voltageOff);

-               if (m_sec)
+               m_tuneTimer->stop();
+               if (m_sec && !m_simulate)

                        m_sec->setRotorMoving(false);
                if (!::close(m_fd))
                        m_fd=-1;
                else
                        eWarning("couldnt close frontend %d", m_dvbid);
                        m_sec->setRotorMoving(false);
                if (!::close(m_fd))
                        m_fd=-1;
                else
                        eWarning("couldnt close frontend %d", m_dvbid);

-               m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1;
+       }
+       else if (m_simulate)
+       {
+               setTone(iDVBFrontend::toneOff);
+               setVoltage(iDVBFrontend::voltageOff);

        }
 #if HAVE_DVB_API_VERSION < 3
        if (m_secfd >= 0)
        }
 #if HAVE_DVB_API_VERSION < 3
        if (m_secfd >= 0)


@@ -531,21 +624,28 @@ int eDVBFrontend::closeFrontend()
                        eWarning("couldnt close sec %d", m_dvbid);
        }
 #endif
                        eWarning("couldnt close sec %d", m_dvbid);
        }
 #endif

-       delete m_sn;

        m_sn=0;
        m_sn=0;

+       m_state = stateClosed;

 
        return 0;
 }
 
 eDVBFrontend::~eDVBFrontend()
 {
 
        return 0;
 }
 
 eDVBFrontend::~eDVBFrontend()
 {

+       m_data[LINKED_PREV_PTR] = m_data[LINKED_NEXT_PTR] = -1;

        closeFrontend();
        closeFrontend();

-       delete m_timeout;
-       delete m_tuneTimer;

 }
 
 void eDVBFrontend::feEvent(int w)
 {
 }
 
 void eDVBFrontend::feEvent(int w)
 {

+       eDVBFrontend *sec_fe = this;
+       long tmp = m_data[LINKED_PREV_PTR];
+       while (tmp != -1)
+       {
+               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+               sec_fe = linked_fe->m_frontend;
+               sec_fe->getData(LINKED_NEXT_PTR, tmp);
+       }

        while (1)
        {
 #if HAVE_DVB_API_VERSION < 3
        while (1)
        {
 #if HAVE_DVB_API_VERSION < 3


@@ -560,12 +660,6 @@ void eDVBFrontend::feEvent(int w)
                if (res && (errno == EAGAIN))
                        break;
 
                if (res && (errno == EAGAIN))
                        break;
 

-               if (res)
-               {
-                       eWarning("FE_GET_EVENT failed! %m");
-                       return;
-               }
-

                if (w < 0)
                        continue;
 
                if (w < 0)
                        continue;
 


@@ -585,7 +679,7 @@ void eDVBFrontend::feEvent(int w)
                        {
                                eDebug("stateLostLock");
                                state = stateLostLock;
                        {
                                eDebug("stateLostLock");
                                state = stateLostLock;

-                               m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc
+                               sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc

                        }
                }
                if (m_state != state)
                        }
                }
                if (m_state != state)


@@ -606,6 +700,14 @@ void eDVBFrontend::timeout()
        }
 }
 
        }
 }
 

+#define INRANGE(X,Y,Z) (((X<=Y) && (Y<=Z))||((Z<=Y) && (Y<=X)) ? 1 : 0)
+
+/* unsigned 32 bit division */
+static inline uint32_t fe_udiv(uint32_t a, uint32_t b)
+{
+       return (a + b / 2) / b;
+}
+

 int eDVBFrontend::readFrontendData(int type)
 {
        switch(type)
 int eDVBFrontend::readFrontendData(int type)
 {
        switch(type)


@@ -613,74 +715,180 @@ int eDVBFrontend::readFrontendData(int type)
                case bitErrorRate:
                {
                        uint32_t ber=0;
                case bitErrorRate:
                {
                        uint32_t ber=0;

-                       if (ioctl(m_fd, FE_READ_BER, &ber) < 0 && errno != ERANGE)
-                               eDebug("FE_READ_BER failed (%m)");
+                       if (!m_simulate)
+                       {
+                               if (ioctl(m_fd, FE_READ_BER, &ber) < 0 && errno != ERANGE)
+                                       eDebug("FE_READ_BER failed (%m)");
+                       }

                        return ber;
                }
                case signalQuality:
                        return ber;
                }
                case signalQuality:

-               {
-                       uint16_t snr=0;
-                       if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE)
-                               eDebug("FE_READ_SNR failed (%m)");
-                       return snr;
-               }

                case signalQualitydB: /* this will move into the driver */
                {
                case signalQualitydB: /* this will move into the driver */
                {

+                       int sat_max = 1600; // for stv0288 / bsbe2
+                       int ret = 0x12345678;

                        uint16_t snr=0;
                        uint16_t snr=0;

+                       if (m_simulate)
+                               return 0;

                        if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE)
                                eDebug("FE_READ_SNR failed (%m)");
                        if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE)
                                eDebug("FE_READ_SNR failed (%m)");

-                       if (!strcmp(m_description, "BCM4501 (internal)"))
+                       else if (!strcmp(m_description, "BCM4501 (internal)"))
+                       {
+                               float SDS_SNRE = snr << 16;
+                               float snr_in_db;
+
+                               if (oparm.sat.system == eDVBFrontendParametersSatellite::System_DVB_S) // DVB-S1 / QPSK
+                               {
+                                       static float SNR_COEFF[6] = {
+                                               100.0 / 4194304.0,
+                                               -7136.0 / 4194304.0,
+                                               197418.0 / 4194304.0,
+                                               -2602183.0 / 4194304.0,
+                                               20377212.0 / 4194304.0,
+                                               -37791203.0 / 4194304.0,
+                                       };
+                                       float fval1 = 12.44714 - (2.0 * log10(SDS_SNRE / 256.0)),
+                                         fval2 = pow(10.0, fval1)-1;
+                                       fval1 = 10.0 * log10(fval2);
+
+                                       if (fval1 < 10.0)
+                                       {
+                                               fval2 = SNR_COEFF[0];
+                                               for (int i=1; i<6; ++i)
+                                               {
+                                                       fval2 *= fval1;
+                                                       fval2 += SNR_COEFF[i];
+                                               }
+                                               fval1 = fval2;
+                                       }
+                                       snr_in_db = fval1;
+                               }
+#if HAVE_DVB_API_VERSION >= 3
+                               else
+                               {
+                                       float fval1 = SDS_SNRE / 268435456.0,
+                                                 fval2, fval3, fval4;
+
+                                       if (parm_u_qpsk_fec_inner <= FEC_S2_QPSK_9_10) // DVB-S2 QPSK
+                                       {
+                                               fval2 = 6.76;
+                                               fval3 = 4.35;
+                                       }
+                                       else // 8PSK
+                                       {
+                                               fval1 *= 0.5;
+                                               fval2 = 8.06;
+                                               fval3 = 6.18;
+                                       }
+                                       fval4 = -10.0 * log10(fval1);
+                                       fval1 = fval4;
+                                       for (int i=0; i < 5; ++i)
+                                               fval1 = fval4 - fval2 * log10(1.0+pow(10.0, (fval3-fval1)/fval2));
+                                       snr_in_db = fval1;
+                               }
+#endif
+                               sat_max = 1750;
+                               ret = (int)(snr_in_db * 100);
+                       }
+                       else if (strstr(m_description, "Alps BSBE1 C01A") ||
+                               !strcmp(m_description, "Alps -S(STV0288)"))

                        {
                        {

-                               unsigned int SDS_SNRE = snr << 16;
-
-                               static float SNR_COEFF[6] = {
-                                       100.0 / 4194304.0,
-                                       -7136.0 / 4194304.0,
-                                       197418.0 / 4194304.0,
-                                       -2602183.0 / 4194304.0,
-                                       20377212.0 / 4194304.0,
-                                       -37791203.0 / 4194304.0,
-                               };
-                       
-                               float fval1, fval2, snr_in_db;
-                               int i;
-                               fval1 = 12.44714 - (2.0 * log10(SDS_SNRE / 256.0));
-                               fval2 = pow(10.0, fval1)-1;
-                               fval1 = 10.0 * log10(fval2);
-                       
-                               if (fval1 < 10.0)
+                               if (snr == 0)
+                                       ret = 0;
+                               else if (snr == 0xFFFF) // i think this should not happen
+                                       ret = 100*100;
+                               else

                                {
                                {

-                                       fval2 = SNR_COEFF[0];
-                                       for (i=0; i<6; ++i)
+                                       enum { REALVAL, REGVAL };
+                                       const long CN_lookup[31][2] = {
+                                               {20,8900}, {25,8680}, {30,8420}, {35,8217}, {40,7897},
+                                               {50,7333}, {60,6747}, {70,6162}, {80,5580}, {90,5029},
+                                               {100,4529}, {110,4080}, {120,3685}, {130,3316}, {140,2982},
+                                               {150,2688}, {160,2418}, {170,2188}, {180,1982}, {190,1802},
+                                               {200,1663}, {210,1520}, {220,1400}, {230,1295}, {240,1201},
+                                               {250,1123}, {260,1058}, {270,1004}, {280,957}, {290,920},
+                                               {300,890}
+                                       };
+                                       int add=strchr(m_description, '.') ? 0xA250 : 0xA100;
+                                       long regval = 0xFFFF - ((snr / 3) + add), // revert some dvb api calulations to get the real register value
+                                               Imin=0,
+                                               Imax=30,
+                                               i;
+                                       if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[Imax][REGVAL]))

                                        {
                                        {

-                                               fval2 *= fval1;
-                                               fval2 += SNR_COEFF[i];
+                                               while((Imax-Imin)>1)
+                                               {
+                                                       i=(Imax+Imin)/2;
+                                                       if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[i][REGVAL]))
+                                                               Imax = i;
+                                                       else
+                                                               Imin = i;
+                                               }
+                                               ret = (((regval - CN_lookup[Imin][REGVAL])
+                                                               * (CN_lookup[Imax][REALVAL] - CN_lookup[Imin][REALVAL])
+                                                               / (CN_lookup[Imax][REGVAL] - CN_lookup[Imin][REGVAL]))
+                                                               + CN_lookup[Imin][REALVAL]) * 10;

                                        }
                                        }

-                                       fval1 = fval2;
+                                       else
+                                               ret = 100;

                                }
                                }

-                               snr_in_db = fval1;
-                       
-                               return (int)(snr_in_db * 100.0);

                        }
                        else if (!strcmp(m_description, "Alps BSBE1 702A") ||  // some frontends with STV0299
                                !strcmp(m_description, "Alps -S") ||
                                !strcmp(m_description, "Philips -S") ||
                                !strcmp(m_description, "LG -S") )
                        {
                        }
                        else if (!strcmp(m_description, "Alps BSBE1 702A") ||  // some frontends with STV0299
                                !strcmp(m_description, "Alps -S") ||
                                !strcmp(m_description, "Philips -S") ||
                                !strcmp(m_description, "LG -S") )
                        {

-                               float snr_in_db=(snr-39075)/1764.7;
-                               return (int)(snr_in_db * 100.0);
+                               sat_max = 1500;
+                               ret = (int)((snr-39075)/17.647);

                        } else if (!strcmp(m_description, "Alps BSBE2"))
                        {
                        } else if (!strcmp(m_description, "Alps BSBE2"))
                        {

-                               return (int)((snr >> 7) * 10.0);
-                       } /* else
+                               ret = (int)((snr >> 7) * 10);
+                       } else if (!strcmp(m_description, "Philips CU1216Mk3"))
+                       {
+                               int mse = (~snr) & 0xFF;
+                               switch (parm_u_qam_modulation) {
+                               case QAM_16: ret = fe_udiv(1950000, (32 * mse) + 138) + 1000; break;
+                               case QAM_32: ret = fe_udiv(2150000, (40 * mse) + 500) + 1350; break;
+                               case QAM_64: ret = fe_udiv(2100000, (40 * mse) + 500) + 1250; break;
+                               case QAM_128: ret = fe_udiv(1850000, (38 * mse) + 400) + 1380; break;
+                               case QAM_256: ret = fe_udiv(1800000, (100 * mse) + 40) + 2030; break;
+                               default: break;
+                               }
+                       } else if (!strcmp(m_description, "Philips TU1216"))
+                       {
+                               snr = 0xFF - (snr & 0xFF);
+                               if (snr != 0)
+                                       ret = 10 * (int)(-100 * (log10(snr) - log10(255)));
+                       }
+                       else if (strstr(m_description, "BCM4506") || strstr(m_description, "BCM4505"))
+                               ret = (snr * 100) >> 8;
+
+                       if (type == signalQuality)
+                       {
+                               if (ret == 0x12345678) // no snr db calculation avail.. return untouched snr value..
+                                       return snr;
+                               switch(m_type)
+                               {
+                                       case feSatellite:
+                                               return ret >= sat_max ? 65536 : ret * 65536 / sat_max;
+                                       case feCable: // we assume a max of 42db here
+                                               return ret >= 4200 ? 65536 : ret * 65536 / 4200;
+                                       case feTerrestrial: // we assume a max of 24db here
+                                               return ret >= 2400 ? 65536 : ret * 65536 / 2400;
+                               }
+                       }
+/* else

                                eDebug("no SNR dB calculation for frontendtype %s yet", m_description); */
                                eDebug("no SNR dB calculation for frontendtype %s yet", m_description); */

-                       return 0x12345678;
+                       return ret;

                }
                case signalPower:
                {
                        uint16_t strength=0;
                }
                case signalPower:
                {
                        uint16_t strength=0;

-                       if (ioctl(m_fd, FE_READ_SIGNAL_STRENGTH, &strength) < 0 && errno != ERANGE)
-                               eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)");
+                       if (!m_simulate)
+                       {
+                               if (ioctl(m_fd, FE_READ_SIGNAL_STRENGTH, &strength) < 0 && errno != ERANGE)
+                                       eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)");
+                       }

                        return strength;
                }
                case locked:
                        return strength;
                }
                case locked:


@@ -690,9 +898,13 @@ int eDVBFrontend::readFrontendData(int type)
 #else
                        fe_status_t status;
 #endif
 #else
                        fe_status_t status;
 #endif

-                       if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE )
-                               eDebug("FE_READ_STATUS failed (%m)");
-                       return !!(status&FE_HAS_LOCK);
+                       if (!m_simulate)
+                       {
+                               if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE )
+                                       eDebug("FE_READ_STATUS failed (%m)");
+                               return !!(status&FE_HAS_LOCK);
+                       }
+                       return 1;

                }
                case synced:
                {
                }
                case synced:
                {


@@ -701,9 +913,13 @@ int eDVBFrontend::readFrontendData(int type)
 #else
                        fe_status_t status;
 #endif
 #else
                        fe_status_t status;
 #endif

-                       if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE )
-                               eDebug("FE_READ_STATUS failed (%m)");
-                       return !!(status&FE_HAS_SYNC);
+                       if (!m_simulate)
+                       {
+                               if ( ioctl(m_fd, FE_READ_STATUS, &status) < 0 && errno != ERANGE )
+                                       eDebug("FE_READ_STATUS failed (%m)");
+                               return !!(status&FE_HAS_SYNC);
+                       }
+                       return 1;

                }
                case frontendNumber:
                        return m_slotid;
                }
                case frontendNumber:
                        return m_slotid;


@@ -749,287 +965,294 @@ void PutToDict(ePyObject &dict, const char*key, const char *value)
                eDebug("could not create PyObject for %s", key);
 }
 
                eDebug("could not create PyObject for %s", key);
 }
 

-void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
+void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
+{
+       PutToDict(dict, "tuner_type", "DVB-S");
+       PutToDict(dict, "frequency", feparm.frequency);
+       PutToDict(dict, "symbol_rate", feparm.symbol_rate);
+       PutToDict(dict, "orbital_position", feparm.orbital_position);
+       PutToDict(dict, "inversion", feparm.inversion);
+       PutToDict(dict, "fec_inner", feparm.fec);
+       PutToDict(dict, "modulation", feparm.modulation);
+       PutToDict(dict, "polarization", feparm.polarisation);
+       if (feparm.system == eDVBFrontendParametersSatellite::System_DVB_S2)
+       {
+               PutToDict(dict, "rolloff", feparm.rolloff);
+               PutToDict(dict, "pilot", feparm.pilot);
+       }
+       PutToDict(dict, "system", feparm.system);
+}
+
+void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm)
+{
+       PutToDict(dict, "tuner_type", "DVB-T");
+       PutToDict(dict, "frequency", feparm.frequency);
+       PutToDict(dict, "bandwidth", feparm.bandwidth);
+       PutToDict(dict, "code_rate_lp", feparm.code_rate_LP);
+       PutToDict(dict, "code_rate_hp", feparm.code_rate_HP);
+       PutToDict(dict, "constellation", feparm.modulation);
+       PutToDict(dict, "transmission_mode", feparm.transmission_mode);
+       PutToDict(dict, "guard_interval", feparm.guard_interval);
+       PutToDict(dict, "hierarchy_information", feparm.hierarchy);
+       PutToDict(dict, "inversion", feparm.inversion);
+}
+
+void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm)
+{
+       PutToDict(dict, "tuner_type", "DVB-C");
+       PutToDict(dict, "frequency", feparm.frequency);
+       PutToDict(dict, "symbol_rate", feparm.symbol_rate);
+       PutToDict(dict, "modulation", feparm.modulation);
+       PutToDict(dict, "inversion", feparm.inversion);
+       PutToDict(dict, "fec_inner", feparm.fec_inner);
+}
+
+#if HAVE_DVB_API_VERSION >= 5
+static void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, struct dtv_property *p, long freq_offset, int orb_pos, int polarization)

 {
 {

-       int freq_offset=0;
-       int csw=0;
-       const char *tmp=0;
-       fe->getData(eDVBFrontend::CSW, csw);
-       fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
+       long tmp=0;

        int frequency = parm_frequency + freq_offset;
        PutToDict(dict, "frequency", frequency);
        PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);
        int frequency = parm_frequency + freq_offset;
        PutToDict(dict, "frequency", frequency);
        PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);

+       PutToDict(dict, "orbital_position", orb_pos);
+       PutToDict(dict, "polarization", polarization);
+

        switch(parm_u_qpsk_fec_inner)
        {
        switch(parm_u_qpsk_fec_inner)
        {

-       case FEC_1_2:
-               tmp = "FEC_1_2";
-               break;
-       case FEC_2_3:
-               tmp = "FEC_2_3";
-               break;
-       case FEC_3_4:
-               tmp = "FEC_3_4";
-               break;
-       case FEC_5_6:
-               tmp = "FEC_5_6";
-               break;
-       case FEC_7_8:
-               tmp = "FEC_7_8";
-               break;
-       case FEC_NONE:
-               tmp = "FEC_NONE";
+       case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;
+       case FEC_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break;
+       case FEC_3_4: tmp = eDVBFrontendParametersSatellite::FEC_3_4; break;
+       case FEC_3_5: tmp = eDVBFrontendParametersSatellite::FEC_3_5; break;
+       case FEC_4_5: tmp = eDVBFrontendParametersSatellite::FEC_4_5; break;
+       case FEC_5_6: tmp = eDVBFrontendParametersSatellite::FEC_5_6; break;
+       case FEC_7_8: tmp = eDVBFrontendParametersSatellite::FEC_7_8; break;
+       case FEC_8_9: tmp = eDVBFrontendParametersSatellite::FEC_8_9; break;
+       case FEC_9_10: tmp = eDVBFrontendParametersSatellite::FEC_9_10; break;
+       case FEC_NONE: tmp = eDVBFrontendParametersSatellite::FEC_None; break;
+       case FEC_AUTO: tmp = eDVBFrontendParametersSatellite::FEC_Auto; break;
+       default: eDebug("got unsupported FEC from frontend! report as FEC_AUTO!\n");
+       }
+
+       switch (p[0].u.data)
+       {
+       default: eDebug("got unsupported system from frontend! report as DVBS!");
+       case SYS_DVBS: tmp = eDVBFrontendParametersSatellite::System_DVB_S; break;
+       case SYS_DVBS2:
+       {
+               switch (p[2].u.data)
+               {
+               default: eDebug("got unsupported rolloff from frontend! report as 0_20!");
+               case ROLLOFF_20: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_20; break;
+               case ROLLOFF_25: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_25; break;
+               case ROLLOFF_35: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_35; break;
+               }
+               PutToDict(dict, "rolloff", tmp);
+
+               switch (p[3].u.data)
+               {
+               case PILOT_OFF: tmp = eDVBFrontendParametersSatellite::Pilot_Off; break;
+               case PILOT_ON: tmp = eDVBFrontendParametersSatellite::Pilot_On; break;
+               case PILOT_AUTO: tmp = eDVBFrontendParametersSatellite::Pilot_Unknown; break;
+               }
+               PutToDict(dict, "pilot", tmp);
+
+               tmp = eDVBFrontendParametersSatellite::System_DVB_S2; break;
+       }
+       }
+       PutToDict(dict, "system", tmp);
+
+       switch (p[1].u.data)
+       {
+       default: eDebug("got unsupported modulation from frontend! report as QPSK!");
+       case QPSK: tmp = eDVBFrontendParametersSatellite::Modulation_QPSK; break;
+       case PSK_8: tmp = eDVBFrontendParametersSatellite::Modulation_8PSK; break;
+       }
+       PutToDict(dict, "modulation", tmp);
+}
+
+#else
+static void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, long freq_offset, int orb_pos, int polarization)
+{
+       long tmp=0;
+       int frequency = parm_frequency + freq_offset;
+       PutToDict(dict, "frequency", frequency);
+       PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);
+       PutToDict(dict, "orbital_position", orb_pos);
+       PutToDict(dict, "polarization", polarization);
+
+       switch(parm_u_qpsk_fec_inner)
+       {
+       case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;
+       case FEC_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break;
+       case FEC_3_4: tmp = eDVBFrontendParametersSatellite::FEC_3_4; break;
+       case FEC_5_6: tmp = eDVBFrontendParametersSatellite::FEC_5_6; break;
+       case FEC_7_8: tmp = eDVBFrontendParametersSatellite::FEC_7_8; break;
+       case FEC_NONE: tmp = eDVBFrontendParametersSatellite::FEC_None; break;

        default:
        default:

-       case FEC_AUTO:
-               tmp = "FEC_AUTO";
-               break;
+       case FEC_AUTO: tmp = eDVBFrontendParametersSatellite::FEC_Auto; break;

 #if HAVE_DVB_API_VERSION >=3
        case FEC_S2_8PSK_1_2:
 #if HAVE_DVB_API_VERSION >=3
        case FEC_S2_8PSK_1_2:

-       case FEC_S2_QPSK_1_2:
-               tmp = "FEC_1_2";
-               break;
+       case FEC_S2_QPSK_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;

        case FEC_S2_8PSK_2_3:
        case FEC_S2_8PSK_2_3:

-       case FEC_S2_QPSK_2_3:
-               tmp = "FEC_2_3";
-               break;
+       case FEC_S2_QPSK_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break;

        case FEC_S2_8PSK_3_4:
        case FEC_S2_8PSK_3_4:

-       case FEC_S2_QPSK_3_4:
-               tmp = "FEC_3_4";
-               break;
+       case FEC_S2_QPSK_3_4: tmp = eDVBFrontendParametersSatellite::FEC_3_4; break;

        case FEC_S2_8PSK_5_6:
        case FEC_S2_8PSK_5_6:

-       case FEC_S2_QPSK_5_6:
-               tmp = "FEC_5_6";
-               break;
+       case FEC_S2_QPSK_5_6: tmp = eDVBFrontendParametersSatellite::FEC_5_6; break;

        case FEC_S2_8PSK_7_8:
        case FEC_S2_8PSK_7_8:

-       case FEC_S2_QPSK_7_8:
-               tmp = "FEC_7_8";
-               break;
+       case FEC_S2_QPSK_7_8: tmp = eDVBFrontendParametersSatellite::FEC_7_8; break;

        case FEC_S2_8PSK_8_9:
        case FEC_S2_8PSK_8_9:

-       case FEC_S2_QPSK_8_9:
-               tmp = "FEC_8_9";
-               break;
+       case FEC_S2_QPSK_8_9: tmp = eDVBFrontendParametersSatellite::FEC_8_9; break;

        case FEC_S2_8PSK_3_5:
        case FEC_S2_8PSK_3_5:

-       case FEC_S2_QPSK_3_5:
-               tmp = "FEC_3_5";
-               break;
+       case FEC_S2_QPSK_3_5: tmp = eDVBFrontendParametersSatellite::FEC_3_5; break;

        case FEC_S2_8PSK_4_5:
        case FEC_S2_8PSK_4_5:

-       case FEC_S2_QPSK_4_5:
-               tmp = "FEC_4_5";
-               break;
+       case FEC_S2_QPSK_4_5: tmp = eDVBFrontendParametersSatellite::FEC_4_5; break;

        case FEC_S2_8PSK_9_10:
        case FEC_S2_8PSK_9_10:

-       case FEC_S2_QPSK_9_10:
-               tmp = "FEC_9_10";
-               break;
+       case FEC_S2_QPSK_9_10: tmp = eDVBFrontendParametersSatellite::FEC_9_10; break;

 #endif
        }
 #endif
        }

+       PutToDict(dict, "fec_inner", tmp);

 #if HAVE_DVB_API_VERSION >=3
        PutToDict(dict, "modulation",
 #if HAVE_DVB_API_VERSION >=3
        PutToDict(dict, "modulation",

-               parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" );
+               parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ?
+                       eDVBFrontendParametersSatellite::Modulation_8PSK :
+                       eDVBFrontendParametersSatellite::Modulation_QPSK );
+       if (parm_u_qpsk_fec_inner > FEC_AUTO)
+       {
+               switch(parm_inversion & 0xc)
+               {
+               default: // unknown rolloff
+               case 0: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_35; break;
+               case 4: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_25; break;
+               case 8: tmp = eDVBFrontendParametersSatellite::RollOff_alpha_0_20; break;
+               }
+               PutToDict(dict, "rolloff", tmp);
+               switch(parm_inversion & 0x30)
+               {
+               case 0: tmp = eDVBFrontendParametersSatellite::Pilot_Off; break;
+               case 0x10: tmp = eDVBFrontendParametersSatellite::Pilot_On; break;
+               case 0x20: tmp = eDVBFrontendParametersSatellite::Pilot_Unknown; break;
+               }
+               PutToDict(dict, "pilot", tmp);
+               tmp = eDVBFrontendParametersSatellite::System_DVB_S2;
+       }
+       else
+               tmp = eDVBFrontendParametersSatellite::System_DVB_S;

 #else
 #else

-       PutToDict(dict, "modulation", "QPSK" );
+       PutToDict(dict, "modulation", eDVBFrontendParametersSatellite::Modulation_QPSK );
+       tmp = eDVBFrontendParametersSatellite::System_DVB_S;

 #endif
 #endif

-       PutToDict(dict, "fec_inner", tmp);
-       tmp = parm_u_qpsk_fec_inner > FEC_AUTO ?
-               "DVB-S2" : "DVB-S";

        PutToDict(dict, "system", tmp);
 }
        PutToDict(dict, "system", tmp);
 }

+#endif

 
 

-void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm)
+static void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm)

 {
 {

-       const char *tmp=0;
+       long tmp=0;
+#if HAVE_DVB_API_VERSION < 3
+       PutToDict(dict, "frequency", parm_frequency);
+#else

        PutToDict(dict, "frequency", parm_frequency/1000);
        PutToDict(dict, "frequency", parm_frequency/1000);

+#endif

        PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate);
        switch(parm_u_qam_fec_inner)
        {
        PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate);
        switch(parm_u_qam_fec_inner)
        {

-       case FEC_NONE:
-               tmp = "FEC_NONE";
-               break;
-       case FEC_1_2:
-               tmp = "FEC_1_2";
-               break;
-       case FEC_2_3:
-               tmp = "FEC_2_3";
-               break;
-       case FEC_3_4:
-               tmp = "FEC_3_4";
-               break;
-       case FEC_5_6:
-               tmp = "FEC_5_6";
-               break;
-       case FEC_7_8:
-               tmp = "FEC_7_8";
-               break;
+       case FEC_NONE: tmp = eDVBFrontendParametersCable::FEC_None; break;
+       case FEC_1_2: tmp = eDVBFrontendParametersCable::FEC_1_2; break;
+       case FEC_2_3: tmp = eDVBFrontendParametersCable::FEC_2_3; break;
+       case FEC_3_4: tmp = eDVBFrontendParametersCable::FEC_3_4; break;
+       case FEC_5_6: tmp = eDVBFrontendParametersCable::FEC_5_6; break;
+       case FEC_7_8: tmp = eDVBFrontendParametersCable::FEC_7_8; break;

 #if HAVE_DVB_API_VERSION >= 3
 #if HAVE_DVB_API_VERSION >= 3

-       case FEC_8_9:
-               tmp = "FEC_8_9";
-               break;
+       case FEC_8_9: tmp = eDVBFrontendParametersCable::FEC_7_8; break;

 #endif
        default:
 #endif
        default:

-       case FEC_AUTO:
-               tmp = "FEC_AUTO";
-               break;
+       case FEC_AUTO: tmp = eDVBFrontendParametersCable::FEC_Auto; break;

        }
        PutToDict(dict, "fec_inner", tmp);
        switch(parm_u_qam_modulation)
        {
        }
        PutToDict(dict, "fec_inner", tmp);
        switch(parm_u_qam_modulation)
        {

-       case QAM_16:
-               tmp = "QAM_16";
-               break;
-       case QAM_32:
-               tmp = "QAM_32";
-               break;
-       case QAM_64:
-               tmp = "QAM_64";
-               break;
-       case QAM_128:
-               tmp = "QAM_128";
-               break;
-       case QAM_256:
-               tmp = "QAM_256";
-               break;
+       case QAM_16: tmp = eDVBFrontendParametersCable::Modulation_QAM16; break;
+       case QAM_32: tmp = eDVBFrontendParametersCable::Modulation_QAM32; break;
+       case QAM_64: tmp = eDVBFrontendParametersCable::Modulation_QAM64; break;
+       case QAM_128: tmp = eDVBFrontendParametersCable::Modulation_QAM128; break;
+       case QAM_256: tmp = eDVBFrontendParametersCable::Modulation_QAM256; break;

        default:
        default:

-       case QAM_AUTO:
-               tmp = "QAM_AUTO";
-               break;
+       case QAM_AUTO:   tmp = eDVBFrontendParametersCable::Modulation_Auto; break;

        }
        PutToDict(dict, "modulation", tmp);
 }
 
        }
        PutToDict(dict, "modulation", tmp);
 }
 

-void fillDictWithTerrestrialData(ePyObject dict, const FRONTENDPARAMETERS &parm)
+static void fillDictWithTerrestrialData(ePyObject dict, const FRONTENDPARAMETERS &parm)

 {
 {

-       const char *tmp=0;
+       long tmp=0;

        PutToDict(dict, "frequency", parm_frequency);
        switch (parm_u_ofdm_bandwidth)
        {
        PutToDict(dict, "frequency", parm_frequency);
        switch (parm_u_ofdm_bandwidth)
        {

-       case BANDWIDTH_8_MHZ:
-               tmp = "BANDWIDTH_8_MHZ";
-               break;
-       case BANDWIDTH_7_MHZ:
-               tmp = "BANDWIDTH_7_MHZ";
-               break;
-       case BANDWIDTH_6_MHZ:
-               tmp = "BANDWIDTH_6_MHZ";
-               break;
+       case BANDWIDTH_8_MHZ: tmp = eDVBFrontendParametersTerrestrial::Bandwidth_8MHz; break;
+       case BANDWIDTH_7_MHZ: tmp = eDVBFrontendParametersTerrestrial::Bandwidth_7MHz; break;
+       case BANDWIDTH_6_MHZ: tmp = eDVBFrontendParametersTerrestrial::Bandwidth_6MHz; break;

        default:
        default:

-       case BANDWIDTH_AUTO:
-               tmp = "BANDWIDTH_AUTO";
-               break;
+       case BANDWIDTH_AUTO: tmp = eDVBFrontendParametersTerrestrial::Bandwidth_Auto; break;

        }
        PutToDict(dict, "bandwidth", tmp);
        switch (parm_u_ofdm_code_rate_LP)
        {
        }
        PutToDict(dict, "bandwidth", tmp);
        switch (parm_u_ofdm_code_rate_LP)
        {

-       case FEC_1_2:
-               tmp = "FEC_1_2";
-               break;
-       case FEC_2_3:
-               tmp = "FEC_2_3";
-               break;
-       case FEC_3_4:
-               tmp = "FEC_3_4";
-               break;
-       case FEC_5_6:
-               tmp = "FEC_5_6";
-               break;
-       case FEC_7_8:
-               tmp = "FEC_7_8";
-               break;
+       case FEC_1_2: tmp = eDVBFrontendParametersTerrestrial::FEC_1_2; break;
+       case FEC_2_3: tmp = eDVBFrontendParametersTerrestrial::FEC_2_3; break;
+       case FEC_3_4: tmp = eDVBFrontendParametersTerrestrial::FEC_3_4; break;
+       case FEC_5_6: tmp = eDVBFrontendParametersTerrestrial::FEC_5_6; break;
+       case FEC_7_8: tmp = eDVBFrontendParametersTerrestrial::FEC_7_8; break;

        default:
        default:

-       case FEC_AUTO:
-               tmp = "FEC_AUTO";
-               break;
+       case FEC_AUTO: tmp = eDVBFrontendParametersTerrestrial::FEC_Auto; break;

        }
        PutToDict(dict, "code_rate_lp", tmp);
        switch (parm_u_ofdm_code_rate_HP)
        {
        }
        PutToDict(dict, "code_rate_lp", tmp);
        switch (parm_u_ofdm_code_rate_HP)
        {

-       case FEC_1_2:
-               tmp = "FEC_1_2";
-               break;
-       case FEC_2_3:
-               tmp = "FEC_2_3";
-               break;
-       case FEC_3_4:
-               tmp = "FEC_3_4";
-               break;
-       case FEC_5_6:
-               tmp = "FEC_5_6";
-               break;
-       case FEC_7_8:
-               tmp = "FEC_7_8";
-               break;
+       case FEC_1_2: tmp = eDVBFrontendParametersTerrestrial::FEC_1_2; break;
+       case FEC_2_3: tmp = eDVBFrontendParametersTerrestrial::FEC_2_3; break;
+       case FEC_3_4: tmp = eDVBFrontendParametersTerrestrial::FEC_3_4; break;
+       case FEC_5_6: tmp = eDVBFrontendParametersTerrestrial::FEC_5_6; break;
+       case FEC_7_8: tmp = eDVBFrontendParametersTerrestrial::FEC_7_8; break;

        default:
        default:

-       case FEC_AUTO:
-               tmp = "FEC_AUTO";
-               break;
+       case FEC_AUTO: tmp = eDVBFrontendParametersTerrestrial::FEC_Auto; break;

        }
        PutToDict(dict, "code_rate_hp", tmp);
        switch (parm_u_ofdm_constellation)
        {
        }
        PutToDict(dict, "code_rate_hp", tmp);
        switch (parm_u_ofdm_constellation)
        {

-       case QPSK:
-               tmp = "QPSK";
-               break;
-       case QAM_16:
-               tmp = "QAM_16";
-               break;
-       case QAM_64:
-               tmp = "QAM_64";
-               break;
+       case QPSK: tmp = eDVBFrontendParametersTerrestrial::Modulation_QPSK; break;
+       case QAM_16: tmp = eDVBFrontendParametersTerrestrial::Modulation_QAM16; break;
+       case QAM_64: tmp = eDVBFrontendParametersTerrestrial::Modulation_QAM64; break;

        default:
        default:

-       case QAM_AUTO:
-               tmp = "QAM_AUTO";
-               break;
+       case QAM_AUTO: tmp = eDVBFrontendParametersTerrestrial::Modulation_Auto; break;

        }
        PutToDict(dict, "constellation", tmp);
        switch (parm_u_ofdm_transmission_mode)
        {
        }
        PutToDict(dict, "constellation", tmp);
        switch (parm_u_ofdm_transmission_mode)
        {

-       case TRANSMISSION_MODE_2K:
-               tmp = "TRANSMISSION_MODE_2K";
-               break;
-       case TRANSMISSION_MODE_8K:
-               tmp = "TRANSMISSION_MODE_8K";
-               break;
+       case TRANSMISSION_MODE_2K: tmp = eDVBFrontendParametersTerrestrial::TransmissionMode_2k; break;
+       case TRANSMISSION_MODE_8K: tmp = eDVBFrontendParametersTerrestrial::TransmissionMode_8k; break;

        default:
        default:

-       case TRANSMISSION_MODE_AUTO:
-               tmp = "TRANSMISSION_MODE_AUTO";
-               break;
+       case TRANSMISSION_MODE_AUTO: tmp = eDVBFrontendParametersTerrestrial::TransmissionMode_Auto; break;

        }
        PutToDict(dict, "transmission_mode", tmp);
        switch (parm_u_ofdm_guard_interval)
        {
        }
        PutToDict(dict, "transmission_mode", tmp);
        switch (parm_u_ofdm_guard_interval)
        {

-               case GUARD_INTERVAL_1_32:
-                       tmp = "GUARD_INTERVAL_1_32";
-                       break;
-               case GUARD_INTERVAL_1_16:
-                       tmp = "GUARD_INTERVAL_1_16";
-                       break;
-               case GUARD_INTERVAL_1_8:
-                       tmp = "GUARD_INTERVAL_1_8";
-                       break;
-               case GUARD_INTERVAL_1_4:
-                       tmp = "GUARD_INTERVAL_1_4";
-                       break;
+               case GUARD_INTERVAL_1_32: tmp = eDVBFrontendParametersTerrestrial::GuardInterval_1_32; break;
+               case GUARD_INTERVAL_1_16: tmp = eDVBFrontendParametersTerrestrial::GuardInterval_1_16; break;
+               case GUARD_INTERVAL_1_8: tmp = eDVBFrontendParametersTerrestrial::GuardInterval_1_8; break;
+               case GUARD_INTERVAL_1_4: tmp = eDVBFrontendParametersTerrestrial::GuardInterval_1_4; break;

                default:
                default:

-               case GUARD_INTERVAL_AUTO:
-                       tmp = "GUARD_INTERVAL_AUTO";
-                       break;
+               case GUARD_INTERVAL_AUTO: tmp = eDVBFrontendParametersTerrestrial::GuardInterval_Auto; break;

        }
        PutToDict(dict, "guard_interval", tmp);
        switch (parm_u_ofdm_hierarchy_information)
        {
        }
        PutToDict(dict, "guard_interval", tmp);
        switch (parm_u_ofdm_hierarchy_information)
        {

-               case HIERARCHY_NONE:
-                       tmp = "HIERARCHY_NONE";
-                       break;
-               case HIERARCHY_1:
-                       tmp = "HIERARCHY_1";
-                       break;
-               case HIERARCHY_2:
-                       tmp = "HIERARCHY_2";
-                       break;
-               case HIERARCHY_4:
-                       tmp = "HIERARCHY_4";
-                       break;
+               case HIERARCHY_NONE: tmp = eDVBFrontendParametersTerrestrial::Hierarchy_None; break;
+               case HIERARCHY_1: tmp = eDVBFrontendParametersTerrestrial::Hierarchy_1; break;
+               case HIERARCHY_2: tmp = eDVBFrontendParametersTerrestrial::Hierarchy_2; break;
+               case HIERARCHY_4: tmp = eDVBFrontendParametersTerrestrial::Hierarchy_4; break;

                default:
                default:

-               case HIERARCHY_AUTO:
-                       tmp = "HIERARCHY_AUTO";
-                       break;
+               case HIERARCHY_AUTO: tmp = eDVBFrontendParametersTerrestrial::Hierarchy_Auto; break;

        }
        PutToDict(dict, "hierarchy_information", tmp);
 }
        }
        PutToDict(dict, "hierarchy_information", tmp);
 }


@@ -1079,51 +1302,80 @@ void eDVBFrontend::getFrontendStatus(ePyObject dest)
 
 void eDVBFrontend::getTransponderData(ePyObject dest, bool original)
 {
 
 void eDVBFrontend::getTransponderData(ePyObject dest, bool original)
 {

-       if (m_fd != -1 && dest && PyDict_Check(dest))
+       if (dest && PyDict_Check(dest))

        {
        {

-               switch(m_type)
+               FRONTENDPARAMETERS front;
+#if HAVE_DVB_API_VERSION >= 5
+               struct dtv_property p[4];
+               struct dtv_properties cmdseq;
+               cmdseq.props = p;
+               cmdseq.num = 4;
+               p[0].cmd = DTV_DELIVERY_SYSTEM;
+               p[1].cmd = DTV_MODULATION;
+               p[2].cmd = DTV_ROLLOFF;
+               p[3].cmd = DTV_PILOT;
+#endif
+               if (m_simulate || m_fd == -1 || original)
+                       original = true;
+#if HAVE_DVB_API_VERSION >= 5
+               else if (m_type == feSatellite && // yet just use new api for DVB-S(2) only
+                       ioctl(m_fd, FE_GET_PROPERTY, &cmdseq)<0)

                {
                {

-                       case feSatellite:
-                       case feCable:
-                       case feTerrestrial:
+                       eDebug("FE_GET_PROPERTY failed (%m)");
+                       original = true;
+               }
+#endif
+               else if (ioctl(m_fd, FE_GET_FRONTEND, &front)<0)
+               {
+                       eDebug("FE_GET_FRONTEND failed (%m)");
+                       original = true;
+               }
+               if (original)
+               {
+                       switch(m_type)

                        {
                        {

-                               FRONTENDPARAMETERS front;
-                               if (!original && ioctl(m_fd, FE_GET_FRONTEND, &front)<0)
-                                       eDebug("FE_GET_FRONTEND (%m)");
-                               else
-                               {
-                                       const FRONTENDPARAMETERS &parm = original ? this->parm : front;
-                                       const char *tmp = "INVERSION_AUTO";
-                                       switch(parm_inversion)
-                                       {
-                                               case INVERSION_ON:
-                                                       tmp = "INVERSION_ON";
-                                                       break;
-                                               case INVERSION_OFF:
-                                                       tmp = "INVERSION_OFF";
-                                                       break;
-                                               default:
-                                                       break;
-                                       }
-                                       if (tmp)
-                                               PutToDict(dest, "inversion", tmp);
-
-                                       switch(m_type)
-                                       {
-                                               case feSatellite:
-                                                       fillDictWithSatelliteData(dest, original?parm:front, this);
-                                                       break;
-                                               case feCable:
-                                                       fillDictWithCableData(dest, original?parm:front);
-                                                       break;
-                                               case feTerrestrial:
-                                                       fillDictWithTerrestrialData(dest, original?parm:front);
-                                                       break;
-                                       }
-                               }
+                               case feSatellite:
+                                       PutSatelliteDataToDict(dest, oparm.sat);
+                                       break;
+                               case feCable:
+                                       PutCableDataToDict(dest, oparm.cab);
+                                       break;
+                               case feTerrestrial:
+                                       PutTerrestrialDataToDict(dest, oparm.ter);
+                                       break;
+                       }
+               }
+               else
+               {
+                       FRONTENDPARAMETERS &parm = front;
+                       long tmp = eDVBFrontendParametersSatellite::Inversion_Unknown;
+                       switch(parm_inversion & 3)
+                       {
+                               case INVERSION_ON:
+                                       tmp = eDVBFrontendParametersSatellite::Inversion_On;
+                                       break;
+                               case INVERSION_OFF:
+                                       tmp = eDVBFrontendParametersSatellite::Inversion_Off;
+                               default:
+                                       break;
+                       }
+                       PutToDict(dest, "inversion", tmp);
+                       switch(m_type)
+                       {
+                               case feSatellite:
+#if HAVE_DVB_API_VERSION >= 5
+                                       fillDictWithSatelliteData(dest, parm, p, m_data[FREQ_OFFSET], oparm.sat.orbital_position, oparm.sat.polarisation);
+#else
+                                       fillDictWithSatelliteData(dest, parm, m_data[FREQ_OFFSET], oparm.sat.orbital_position, oparm.sat.polarisation);
+#endif
+                                       break;
+                               case feCable:
+                                       fillDictWithCableData(dest, parm);
+                                       break;
+                               case feTerrestrial:
+                                       fillDictWithTerrestrialData(dest, parm);
+                                       break;

                        }
                        }

-                       default:
-                               break;

                }
        }
 }
                }
        }
 }


@@ -1133,7 +1385,7 @@ void eDVBFrontend::getFrontendData(ePyObject dest)
        if (dest && PyDict_Check(dest))
        {
                const char *tmp=0;
        if (dest && PyDict_Check(dest))
        {
                const char *tmp=0;

-               PutToDict(dest, "tuner_number", m_dvbid);
+               PutToDict(dest, "tuner_number", m_slotid);

                switch(m_type)
                {
                        case feSatellite:
                switch(m_type)
                {
                        case feSatellite:


@@ -1158,29 +1410,44 @@ void eDVBFrontend::getFrontendData(ePyObject dest)
 #endif
 int eDVBFrontend::readInputpower()
 {
 #endif
 int eDVBFrontend::readInputpower()
 {

+       if (m_simulate)
+               return 0;

        int power=m_slotid;  // this is needed for read inputpower from the correct tuner !
        int power=m_slotid;  // this is needed for read inputpower from the correct tuner !

-
-       // open front prozessor
-       int fp=::open("/dev/dbox/fp0", O_RDWR);
-       if (fp < 0)
+       char proc_name[64];
+       sprintf(proc_name, "/proc/stb/fp/lnb_sense%d", m_slotid);
+       FILE *f=fopen(proc_name, "r");
+       if (f)

        {
        {

-               eDebug("couldn't open fp");
-               return -1;
+               if (fscanf(f, "%d", &power) != 1)
+                       eDebug("read %s failed!! (%m)", proc_name);
+               else
+                       eDebug("%s is %d\n", proc_name, power);
+               fclose(f);

        }
        }

-       static bool old_fp = (::ioctl(fp, FP_IOCTL_GET_ID) < 0);
-       if ( ioctl( fp, old_fp ? 9 : 0x100, &power ) < 0 )
+       else

        {
        {

-               eDebug("FP_IOCTL_GET_LNB_CURRENT failed (%m)");
-               return -1;
+               // open front prozessor
+               int fp=::open("/dev/dbox/fp0", O_RDWR);
+               if (fp < 0)
+               {
+                       eDebug("couldn't open fp");
+                       return -1;
+               }
+               static bool old_fp = (::ioctl(fp, FP_IOCTL_GET_ID) < 0);
+               if ( ioctl( fp, old_fp ? 9 : 0x100, &power ) < 0 )
+               {
+                       eDebug("FP_IOCTL_GET_LNB_CURRENT failed (%m)");
+                       return -1;
+               }
+               ::close(fp);

        }
        }

-       ::close(fp);

 
        return power;
 }
 
 bool eDVBFrontend::setSecSequencePos(int steps)
 {
 
        return power;
 }
 
 bool eDVBFrontend::setSecSequencePos(int steps)
 {

-       eDebug("set sequence pos %d", steps);
+       eDebugNoSimulate("set sequence pos %d", steps);

        if (!steps)
                return false;
        while( steps > 0 )
        if (!steps)
                return false;
        while( steps > 0 )


@@ -1198,46 +1465,43 @@ bool eDVBFrontend::setSecSequencePos(int steps)
        return true;
 }
 
        return true;
 }
 

-void eDVBFrontend::setRotorData(int pos, int cmd)
+void eDVBFrontend::tuneLoop()  // called by m_tuneTimer

 {
 {

-       m_data[ROTOR_CMD] = cmd;
-       m_data[ROTOR_POS] = pos;
-       if ( m_data[SATPOS_DEPENDS_PTR] != -1 )
-       {
-               eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) m_data[SATPOS_DEPENDS_PTR];
-               satpos_depends_to_fe->m_frontend->m_data[ROTOR_CMD] = cmd;
-               satpos_depends_to_fe->m_frontend->m_data[ROTOR_POS] = pos;
-       }
-       else
-       {
-               eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR];
-               while ( (int)next != -1 )
-               {
-                       next->m_frontend->m_data[ROTOR_CMD] = cmd;
-                       next->m_frontend->m_data[ROTOR_POS] = pos;
-                       next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[LINKED_NEXT_PTR];
-               }
-               eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)m_data[LINKED_PREV_PTR];
-               while ( (int)prev != -1 )
-               {
-                       prev->m_frontend->m_data[ROTOR_CMD] = cmd;
-                       prev->m_frontend->m_data[ROTOR_POS] = pos;
-                       prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[LINKED_PREV_PTR];
+       int delay=0;
+       eDVBFrontend *sec_fe = this;
+       eDVBRegisteredFrontend *regFE = 0;
+       long tmp = m_data[LINKED_PREV_PTR];
+       while ( tmp != -1 )
+       {
+               eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)tmp;
+               sec_fe = prev->m_frontend;
+               tmp = prev->m_frontend->m_data[LINKED_PREV_PTR];
+               if (tmp == -1 && sec_fe != this && !prev->m_inuse) {
+                       int state = sec_fe->m_state;
+                       // workaround to put the kernel frontend thread into idle state!
+                       if (state != eDVBFrontend::stateIdle && state != stateClosed)
+                       {
+                               sec_fe->closeFrontend(true);
+                               state = sec_fe->m_state;
+                       }
+                       // sec_fe is closed... we must reopen it here..
+                       if (state == stateClosed)
+                       {
+                               regFE = prev;
+                               prev->inc_use();
+                       }

                }
        }
                }
        }

-}

 
 

-void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
-{
-       int delay=0;

        if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() )
        {
        if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() )
        {

-//             eDebug("tuneLoop %d\n", m_sec_sequence.current()->cmd);
+               long *sec_fe_data = sec_fe->m_data;
+//             eDebugNoSimulate("tuneLoop %d\n", m_sec_sequence.current()->cmd);

                switch (m_sec_sequence.current()->cmd)
                {
                        case eSecCommand::SLEEP:
                                delay = m_sec_sequence.current()++->msec;
                switch (m_sec_sequence.current()->cmd)
                {
                        case eSecCommand::SLEEP:
                                delay = m_sec_sequence.current()++->msec;

-                               eDebug("[SEC] sleep %dms", delay);
+                               eDebugNoSimulate("[SEC] sleep %dms", delay);

                                break;
                        case eSecCommand::GOTO:
                                if ( !setSecSequencePos(m_sec_sequence.current()->steps) )
                                break;
                        case eSecCommand::GOTO:
                                if ( !setSecSequencePos(m_sec_sequence.current()->steps) )


@@ -1246,14 +1510,14 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        case eSecCommand::SET_VOLTAGE:
                        {
                                int voltage = m_sec_sequence.current()++->voltage;
                        case eSecCommand::SET_VOLTAGE:
                        {
                                int voltage = m_sec_sequence.current()++->voltage;

-                               eDebug("[SEC] setVoltage %d", voltage);
-                               setVoltage(voltage);
+                               eDebugNoSimulate("[SEC] setVoltage %d", voltage);
+                               sec_fe->setVoltage(voltage);

                                break;
                        }
                        case eSecCommand::IF_VOLTAGE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                                break;
                        }
                        case eSecCommand::IF_VOLTAGE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;

-                               if ( compare.voltage == m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
+                               if ( compare.voltage == sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )

                                        break;
                                ++m_sec_sequence.current();
                                break;
                                        break;
                                ++m_sec_sequence.current();
                                break;


@@ -1261,7 +1525,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        case eSecCommand::IF_NOT_VOLTAGE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                        case eSecCommand::IF_NOT_VOLTAGE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;

-                               if ( compare.voltage != m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
+                               if ( compare.voltage != sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )

                                        break;
                                ++m_sec_sequence.current();
                                break;
                                        break;
                                ++m_sec_sequence.current();
                                break;


@@ -1269,7 +1533,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        case eSecCommand::IF_TONE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                        case eSecCommand::IF_TONE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;

-                               if ( compare.tone == m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
+                               if ( compare.tone == sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) )

                                        break;
                                ++m_sec_sequence.current();
                                break;
                                        break;
                                ++m_sec_sequence.current();
                                break;


@@ -1277,45 +1541,56 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        case eSecCommand::IF_NOT_TONE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                        case eSecCommand::IF_NOT_TONE_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;

-                               if ( compare.tone != m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
+                               if ( compare.tone != sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) )

                                        break;
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::SET_TONE:
                                        break;
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::SET_TONE:

-                               eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone);
-                               setTone(m_sec_sequence.current()++->tone);
+                               eDebugNoSimulate("[SEC] setTone %d", m_sec_sequence.current()->tone);
+                               sec_fe->setTone(m_sec_sequence.current()++->tone);

                                break;
                        case eSecCommand::SEND_DISEQC:
                                break;
                        case eSecCommand::SEND_DISEQC:

-                               sendDiseqc(m_sec_sequence.current()->diseqc);
-                               eDebugNoNewLine("[SEC] sendDiseqc: ");
+                               sec_fe->sendDiseqc(m_sec_sequence.current()->diseqc);
+                               eDebugNoSimulateNoNewLine("[SEC] sendDiseqc: ");

                                for (int i=0; i < m_sec_sequence.current()->diseqc.len; ++i)
                                for (int i=0; i < m_sec_sequence.current()->diseqc.len; ++i)

-                                   eDebugNoNewLine("%02x", m_sec_sequence.current()->diseqc.data[i]);
-                               eDebug("");
+                                   eDebugNoSimulateNoNewLine("%02x", m_sec_sequence.current()->diseqc.data[i]);
+                               if (!memcmp(m_sec_sequence.current()->diseqc.data, "\xE0\x00\x00", 3))
+                                       eDebugNoSimulate("(DiSEqC reset)");
+                               else if (!memcmp(m_sec_sequence.current()->diseqc.data, "\xE0\x00\x03", 3))
+                                       eDebugNoSimulate("(DiSEqC peripherial power on)");
+                               else
+                                       eDebugNoSimulate("");

                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::SEND_TONEBURST:
                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::SEND_TONEBURST:

-                               eDebug("[SEC] sendToneburst: %d", m_sec_sequence.current()->toneburst);
-                               sendToneburst(m_sec_sequence.current()++->toneburst);
+                               eDebugNoSimulate("[SEC] sendToneburst: %d", m_sec_sequence.current()->toneburst);
+                               sec_fe->sendToneburst(m_sec_sequence.current()++->toneburst);

                                break;
                        case eSecCommand::SET_FRONTEND:
                                break;
                        case eSecCommand::SET_FRONTEND:

-                               eDebug("[SEC] setFrontend");
-                               setFrontend();
-                               ++m_sec_sequence.current();
+                       {
+                               int enableEvents = (m_sec_sequence.current()++)->val;
+                               eDebugNoSimulate("[SEC] setFrontend %d", enableEvents);
+                               setFrontend(enableEvents);

                                break;
                                break;

+                       }

                        case eSecCommand::START_TUNE_TIMEOUT:
                        case eSecCommand::START_TUNE_TIMEOUT:

-                               m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
+                       {
+                               int tuneTimeout = m_sec_sequence.current()->timeout;
+                               eDebugNoSimulate("[SEC] startTuneTimeout %d", tuneTimeout);
+                               if (!m_simulate)
+                                       m_timeout->start(tuneTimeout, 1);

                                ++m_sec_sequence.current();
                                break;
                                ++m_sec_sequence.current();
                                break;

+                       }

                        case eSecCommand::SET_TIMEOUT:
                                m_timeoutCount = m_sec_sequence.current()++->val;
                        case eSecCommand::SET_TIMEOUT:
                                m_timeoutCount = m_sec_sequence.current()++->val;

-                               eDebug("[SEC] set timeout %d", m_timeoutCount);
+                               eDebugNoSimulate("[SEC] set timeout %d", m_timeoutCount);

                                break;
                        case eSecCommand::IF_TIMEOUT_GOTO:
                                if (!m_timeoutCount)
                                {
                                break;
                        case eSecCommand::IF_TIMEOUT_GOTO:
                                if (!m_timeoutCount)
                                {

-                                       eDebug("[SEC] rotor timout");
-                                       m_sec->setRotorMoving(false);
+                                       eDebugNoSimulate("[SEC] rotor timout");

                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                }
                                else
                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                }
                                else


@@ -1326,24 +1601,24 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                int idx = m_sec_sequence.current()++->val;
                                if ( idx == 0 || idx == 1 )
                                {
                                int idx = m_sec_sequence.current()++->val;
                                if ( idx == 0 || idx == 1 )
                                {

-                                       m_idleInputpower[idx] = readInputpower();
-                                       eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]);
+                                       m_idleInputpower[idx] = sec_fe->readInputpower();
+                                       eDebugNoSimulate("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]);

                                }
                                else
                                }
                                else

-                                       eDebug("[SEC] idleInputpower measure index(%d) out of bound !!!", idx);
+                                       eDebugNoSimulate("[SEC] idleInputpower measure index(%d) out of bound !!!", idx);

                                break;
                        }
                        case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                                int idx = compare.val;
                                break;
                        }
                        case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO:
                        {
                                eSecCommand::pair &compare = m_sec_sequence.current()->compare;
                                int idx = compare.val;

-                               if ( idx == 0 || idx == 1 )
+                               if ( !m_simulate && (idx == 0 || idx == 1) )

                                {
                                {

-                                       int idle = readInputpower();
+                                       int idle = sec_fe->readInputpower();

                                        int diff = abs(idle-m_idleInputpower[idx]);
                                        if ( diff > 0)
                                        {
                                        int diff = abs(idle-m_idleInputpower[idx]);
                                        if ( diff > 0)
                                        {

-                                               eDebug("measure idle(%d) was not okay.. (%d - %d = %d) retry", idx, m_idleInputpower[idx], idle, diff);
+                                               eDebugNoSimulate("measure idle(%d) was not okay.. (%d - %d = %d) retry", idx, m_idleInputpower[idx], idle, diff);

                                                setSecSequencePos(compare.steps);
                                                break;
                                        }
                                                setSecSequencePos(compare.steps);
                                                break;
                                        }


@@ -1354,39 +1629,80 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        case eSecCommand::IF_TUNER_LOCKED_GOTO:
                        {
                                eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
                        case eSecCommand::IF_TUNER_LOCKED_GOTO:
                        {
                                eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;

-                               if (readFrontendData(locked))
+                               if (m_simulate)
+                               {
+                                       setSecSequencePos(cmd.steps);
+                                       break;
+                               }
+                               int signal = 0;
+                               int isLocked = readFrontendData(locked);
+                               m_idleInputpower[0] = m_idleInputpower[1] = 0;
+                               --m_timeoutCount;
+                               if (!m_timeoutCount && m_retryCount > 0)
+                                       --m_retryCount;
+                               if (isLocked && ((abs((signal = readFrontendData(signalQualitydB)) - cmd.lastSignal) < 40) || !cmd.lastSignal))

                                {
                                {

-                                       eDebug("[SEC] locked step %d ok", cmd.okcount);
+                                       if (cmd.lastSignal)
+                                               eDebugNoSimulate("[SEC] locked step %d ok (%d %d)", cmd.okcount, signal, cmd.lastSignal);
+                                       else
+                                       {
+                                               eDebugNoSimulate("[SEC] locked step %d ok", cmd.okcount);
+                                               if (!cmd.okcount)
+                                                       cmd.lastSignal = signal;
+                                       }

                                        ++cmd.okcount;
                                        ++cmd.okcount;

-                                       if (cmd.okcount > 12)
+                                       if (cmd.okcount > 4)

                                        {
                                        {

-                                               eDebug("ok > 12 .. goto %d\n",m_sec_sequence.current()->steps);
+                                               eDebugNoSimulate("ok > 4 .. goto %d\n", cmd.steps);

                                                setSecSequencePos(cmd.steps);
                                                setSecSequencePos(cmd.steps);

+                                               m_state = stateLock;
+                                               m_stateChanged(this);
+                                               feEvent(-1); // flush events
+                                               m_sn->start();

                                                break;
                                        }
                                }
                                else
                                {
                                                break;
                                        }
                                }
                                else
                                {

-                                       eDebug("[SEC] rotor locked step %d failed", cmd.okcount);
-                                       --m_timeoutCount;
-                                       if (!m_timeoutCount && m_retryCount > 0)
-                                               --m_retryCount;
+                                       if (isLocked)
+                                               eDebugNoSimulate("[SEC] rotor locked step %d failed (oldSignal %d, curSignal %d)", cmd.okcount, signal, cmd.lastSignal);
+                                       else
+                                               eDebugNoSimulate("[SEC] rotor locked step %d failed (not locked)", cmd.okcount);

                                        cmd.okcount=0;
                                        cmd.okcount=0;

+                                       cmd.lastSignal=0;

                                }
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::MEASURE_RUNNING_INPUTPOWER:
                                }
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::MEASURE_RUNNING_INPUTPOWER:

-                               m_runningInputpower = readInputpower();
-                               eDebug("[SEC] runningInputpower is %d", m_runningInputpower);
+                               m_runningInputpower = sec_fe->readInputpower();
+                               eDebugNoSimulate("[SEC] runningInputpower is %d", m_runningInputpower);
+                               ++m_sec_sequence.current();
+                               break;
+                       case eSecCommand::SET_ROTOR_MOVING:
+                               if (!m_simulate)
+                                       m_sec->setRotorMoving(true);
+                               ++m_sec_sequence.current();
+                               break;
+                       case eSecCommand::SET_ROTOR_STOPPED:
+                               if (!m_simulate)
+                                       m_sec->setRotorMoving(false);

                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
                        {
                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
                        {

-                               int idleInputpower = m_idleInputpower[ (m_data[CUR_VOLTAGE]&1) ? 0 : 1];

                                eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
                                eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;

+                               if (m_simulate)
+                               {
+                                       setSecSequencePos(cmd.steps);
+                                       break;
+                               }
+                               int idleInputpower = m_idleInputpower[ (sec_fe_data[CUR_VOLTAGE]&1) ? 0 : 1];

                                const char *txt = cmd.direction ? "running" : "stopped";
                                const char *txt = cmd.direction ? "running" : "stopped";

-                               eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d",
+                               --m_timeoutCount;
+                               if (!m_timeoutCount && m_retryCount > 0)
+                                       --m_retryCount;
+                               eDebugNoSimulate("[SEC] waiting for rotor %s %d, idle %d, delta %d",

                                        txt,
                                        m_runningInputpower,
                                        idleInputpower,
                                        txt,
                                        m_runningInputpower,
                                        idleInputpower,


@@ -1395,50 +1711,62 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                        || (!cmd.direction && abs(m_runningInputpower - idleInputpower) <= cmd.deltaA) )
                                {
                                        ++cmd.okcount;
                                        || (!cmd.direction && abs(m_runningInputpower - idleInputpower) <= cmd.deltaA) )
                                {
                                        ++cmd.okcount;

-                                       eDebug("[SEC] rotor %s step %d ok", txt, cmd.okcount);
+                                       eDebugNoSimulate("[SEC] rotor %s step %d ok", txt, cmd.okcount);

                                        if ( cmd.okcount > 6 )
                                        {
                                        if ( cmd.okcount > 6 )
                                        {

-                                               m_sec->setRotorMoving(cmd.direction);
-                                               eDebug("[SEC] rotor is %s", txt);
+                                               eDebugNoSimulate("[SEC] rotor is %s", txt);

                                                if (setSecSequencePos(cmd.steps))
                                                        break;
                                        }
                                }
                                else
                                {
                                                if (setSecSequencePos(cmd.steps))
                                                        break;
                                        }
                                }
                                else
                                {

-                                       eDebug("[SEC] rotor not %s... reset counter.. increase timeout", txt);
-                                       --m_timeoutCount;
-                                       if (!m_timeoutCount && m_retryCount > 0)
-                                               --m_retryCount;
+                                       eDebugNoSimulate("[SEC] rotor not %s... reset counter.. increase timeout", txt);

                                        cmd.okcount=0;
                                }
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::IF_ROTORPOS_VALID_GOTO:
                                        cmd.okcount=0;
                                }
                                ++m_sec_sequence.current();
                                break;
                        }
                        case eSecCommand::IF_ROTORPOS_VALID_GOTO:

-                               if (m_data[ROTOR_CMD] != -1 && m_data[ROTOR_POS] != -1)
+                               if (sec_fe_data[ROTOR_CMD] != -1 && sec_fe_data[ROTOR_POS] != -1)

                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                else
                                        ++m_sec_sequence.current();
                                break;
                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                else
                                        ++m_sec_sequence.current();
                                break;

+                       case eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS:
+                               eDebugNoSimulate("[SEC] invalidate current switch params");
+                               sec_fe_data[CSW] = -1;
+                               sec_fe_data[UCSW] = -1;
+                               sec_fe_data[TONEBURST] = -1;
+                               ++m_sec_sequence.current();
+                               break;
+                       case eSecCommand::UPDATE_CURRENT_SWITCHPARMS:
+                               sec_fe_data[CSW] = sec_fe_data[NEW_CSW];
+                               sec_fe_data[UCSW] = sec_fe_data[NEW_UCSW];
+                               sec_fe_data[TONEBURST] = sec_fe_data[NEW_TONEBURST];
+                               eDebugNoSimulate("[SEC] update current switch params");
+                               ++m_sec_sequence.current();
+                               break;

                        case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS:
                        case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS:

-                               eDebug("[SEC] invalidate current rotorparams");
-                               setRotorData(-1,-1);    
+                               eDebugNoSimulate("[SEC] invalidate current rotorparams");
+                               sec_fe_data[ROTOR_CMD] = -1;
+                               sec_fe_data[ROTOR_POS] = -1;

                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::UPDATE_CURRENT_ROTORPARAMS:
                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::UPDATE_CURRENT_ROTORPARAMS:

-                               setRotorData(m_data[NEW_ROTOR_POS], m_data[NEW_ROTOR_CMD]);
-                               eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]);
+                               sec_fe_data[ROTOR_CMD] = sec_fe_data[NEW_ROTOR_CMD];
+                               sec_fe_data[ROTOR_POS] = sec_fe_data[NEW_ROTOR_POS];
+                               eDebugNoSimulate("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, sec_fe_data[ROTOR_CMD], sec_fe_data[ROTOR_POS]);

                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::SET_ROTOR_DISEQC_RETRYS:
                                m_retryCount = m_sec_sequence.current()++->val;
                                ++m_sec_sequence.current();
                                break;
                        case eSecCommand::SET_ROTOR_DISEQC_RETRYS:
                                m_retryCount = m_sec_sequence.current()++->val;

-                               eDebug("[SEC] set rotor retries %d", m_retryCount);
+                               eDebugNoSimulate("[SEC] set rotor retries %d", m_retryCount);

                                break;
                        case eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO:
                                if (!m_retryCount)
                                {
                                break;
                        case eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO:
                                if (!m_retryCount)
                                {

-                                       eDebug("[SEC] no more rotor retrys");
+                                       eDebugNoSimulate("[SEC] no more rotor retrys");

                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                }
                                else
                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                }
                                else


@@ -1446,58 +1774,144 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                break;
                        case eSecCommand::SET_POWER_LIMITING_MODE:
                        {
                                break;
                        case eSecCommand::SET_POWER_LIMITING_MODE:
                        {

-                               if (!m_need_rotor_workaround)
-                                       break;
-
-                               char dev[16];
-
-                               // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
-                               if (m_slotid < 2)
-                                       sprintf(dev, "/dev/i2c/%d", m_slotid);
-                               else if (m_slotid == 2)
-                                       sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
-                               else if (m_slotid == 3)
-                                       sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
-                               int fd = ::open(dev, O_RDWR);
-
-                               unsigned char data[2];
-                               ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1);
-                               if(::read(fd, data, 1) != 1)
-                                       eDebug("[SEC] error read lnbp (%m)");
-                               if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic )
-                               {
-                                       data[0] |= 0x80;  // enable static current limiting
-                                       eDebug("[SEC] set static current limiting");
-                               }
-                               else
+                               if (!m_simulate)

                                {
                                {

-                                       data[0] &= ~0x80;  // enable dynamic current limiting
-                                       eDebug("[SEC] set dynamic current limiting");
+                                       char proc_name[64];
+                                       sprintf(proc_name, "/proc/stb/frontend/%d/static_current_limiting", sec_fe->m_dvbid);
+                                       FILE *f=fopen(proc_name, "w");
+                                       if (f) // new interface exist?
+                                       {
+                                               bool slimiting = m_sec_sequence.current()->mode == eSecCommand::modeStatic;
+                                               if (fprintf(f, "%s", slimiting ? "on" : "off") <= 0)
+                                                       eDebugNoSimulate("write %s failed!! (%m)", proc_name);
+                                               else
+                                                       eDebugNoSimulate("[SEC] set %s current limiting", slimiting ? "static" : "dynamic");
+                                               fclose(f);
+                                       }
+                                       else if (sec_fe->m_need_rotor_workaround)
+                                       {
+                                               char dev[16];
+                                               int slotid = sec_fe->m_slotid;
+                                               // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
+                                               if (slotid < 2)
+                                                       sprintf(dev, "/dev/i2c/%d", slotid);
+                                               else if (slotid == 2)
+                                                       sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
+                                               else if (slotid == 3)
+                                                       sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
+                                               int fd = ::open(dev, O_RDWR);
+
+                                               unsigned char data[2];
+                                               ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1);
+                                               if(::read(fd, data, 1) != 1)
+                                                       eDebugNoSimulate("[SEC] error read lnbp (%m)");
+                                               if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic )
+                                               {
+                                                       data[0] |= 0x80;  // enable static current limiting
+                                                       eDebugNoSimulate("[SEC] set static current limiting");
+                                               }
+                                               else
+                                               {
+                                                       data[0] &= ~0x80;  // enable dynamic current limiting
+                                                       eDebugNoSimulate("[SEC] set dynamic current limiting");
+                                               }
+                                               if(::write(fd, data, 1) != 1)
+                                                       eDebugNoSimulate("[SEC] error write lnbp (%m)");
+                                               ::close(fd);
+                                       }

                                }
                                }

-                               if(::write(fd, data, 1) != 1)
-                                       eDebug("[SEC] error write lnbp (%m)");
-                               ::close(fd);

                                ++m_sec_sequence.current();
                                break;
                        }
                        default:
                                ++m_sec_sequence.current();
                                break;
                        }
                        default:

-                               eDebug("[SEC] unhandled sec command %d",
+                               eDebugNoSimulate("[SEC] unhandled sec command %d",

                                        ++m_sec_sequence.current()->cmd);
                                ++m_sec_sequence.current();
                }
                                        ++m_sec_sequence.current()->cmd);
                                ++m_sec_sequence.current();
                }

-               m_tuneTimer->start(delay,true);
+               if (!m_simulate)
+                       m_tuneTimer->start(delay,true);

        }
        }

+       if (regFE)
+               regFE->dec_use();
+       if (m_simulate && m_sec_sequence.current() != m_sec_sequence.end())
+               tuneLoop();

 }
 
 }
 

-void eDVBFrontend::setFrontend()
+void eDVBFrontend::setFrontend(bool recvEvents)

 {
 {

-       eDebug("setting frontend %d", m_dvbid);
-       m_sn->start();
-       feEvent(-1);
-       if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
-       {
-               perror("FE_SET_FRONTEND failed");
-               return;
+       if (!m_simulate)
+       {
+               eDebug("setting frontend %d", m_dvbid);
+               if (recvEvents)
+                       m_sn->start();
+               feEvent(-1); // flush events
+#if HAVE_DVB_API_VERSION >= 5
+               if (m_type == iDVBFrontend::feSatellite)
+               {
+                       fe_rolloff_t rolloff = ROLLOFF_35;
+                       fe_pilot_t pilot = PILOT_OFF;
+                       fe_modulation_t modulation = QPSK;
+                       fe_delivery_system_t system = SYS_DVBS;
+                       switch(oparm.sat.system)
+                       {
+                       case eDVBFrontendParametersSatellite::System_DVB_S: system = SYS_DVBS; break;
+                       case eDVBFrontendParametersSatellite::System_DVB_S2: system = SYS_DVBS2; break;
+                       };
+                       switch(oparm.sat.modulation)
+                       {
+                       case eDVBFrontendParametersSatellite::Modulation_QPSK: modulation = QPSK; break;
+                       case eDVBFrontendParametersSatellite::Modulation_8PSK: modulation = PSK_8; break;
+                       case eDVBFrontendParametersSatellite::Modulation_QAM16: modulation = QAM_16; break;
+                       };
+                       switch(oparm.sat.pilot)
+                       {
+                       case eDVBFrontendParametersSatellite::Pilot_Off: pilot = PILOT_OFF; break;
+                       case eDVBFrontendParametersSatellite::Pilot_On: pilot = PILOT_ON; break;
+                       case eDVBFrontendParametersSatellite::Pilot_Unknown: pilot = PILOT_AUTO; break;
+                       };
+                       switch(oparm.sat.rolloff)
+                       {
+                       case eDVBFrontendParametersSatellite::RollOff_alpha_0_20: rolloff = ROLLOFF_20; break;
+                       case eDVBFrontendParametersSatellite::RollOff_alpha_0_25: rolloff = ROLLOFF_25; break;
+                       case eDVBFrontendParametersSatellite::RollOff_alpha_0_35: rolloff = ROLLOFF_35; break;
+                       };
+                       struct dtv_property p[10];
+                       struct dtv_properties cmdseq;
+                       cmdseq.props = p;
+                       p[0].cmd = DTV_CLEAR;
+                       p[1].cmd = DTV_DELIVERY_SYSTEM, p[1].u.data = system;
+                       p[2].cmd = DTV_FREQUENCY,       p[2].u.data = parm_frequency;
+                       p[3].cmd = DTV_MODULATION,      p[3].u.data = modulation;
+                       p[4].cmd = DTV_SYMBOL_RATE,     p[4].u.data = parm_u_qpsk_symbol_rate;
+                       p[5].cmd = DTV_INNER_FEC,       p[5].u.data = parm_u_qpsk_fec_inner;
+                       p[6].cmd = DTV_INVERSION,       p[6].u.data = parm_inversion;
+                       if (system == SYS_DVBS2)
+                       {
+                               p[7].cmd = DTV_ROLLOFF,         p[7].u.data = rolloff;
+                               p[8].cmd = DTV_PILOT,           p[8].u.data = pilot;
+                               p[9].cmd = DTV_TUNE;
+                               cmdseq.num = 10;
+                       }
+                       else
+                       {
+                               p[7].cmd = DTV_TUNE;
+                               cmdseq.num = 8;
+                       }
+                       if (ioctl(m_fd, FE_SET_PROPERTY, &cmdseq) == -1)
+                       {
+                               perror("FE_SET_PROPERTY failed");
+                               return;
+                       }
+               }
+               else
+#endif
+               {
+                       if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
+                       {
+                               perror("FE_SET_FRONTEND failed");
+                               return;
+                       }
+               }

        }
 }
 
        }
 }
 


@@ -1509,7 +1923,7 @@ RESULT eDVBFrontend::getFrontendType(int &t)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
+RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm, unsigned int tunetimeout)

 {
        int res;
        if (!m_sec)
 {
        int res;
        if (!m_sec)


@@ -1517,10 +1931,24 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
                eWarning("no SEC module active!");
                return -ENOENT;
        }
                eWarning("no SEC module active!");
                return -ENOENT;
        }

-       res = m_sec->prepare(*this, parm, feparm, 1 << m_slotid);
+       res = m_sec->prepare(*this, parm, feparm, 1 << m_slotid, tunetimeout);

        if (!res)
        {
        if (!res)
        {

-               eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d",
+#if HAVE_DVB_API_VERSION >= 3
+               eDebugNoSimulate("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d system %d modulation %d pilot %d, rolloff %d",
+                       feparm.system,
+                       feparm.frequency,
+                       feparm.polarisation,
+                       feparm.symbol_rate,
+                       feparm.inversion,
+                       feparm.fec,
+                       feparm.orbital_position,
+                       feparm.system,
+                       feparm.modulation,
+                       feparm.pilot,
+                       feparm.rolloff);
+#else
+               eDebugNoSimulate("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d",

                        feparm.system,
                        feparm.frequency,
                        feparm.polarisation,
                        feparm.system,
                        feparm.frequency,
                        feparm.polarisation,


@@ -1528,174 +1956,189 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
                        feparm.inversion,
                        feparm.fec,
                        feparm.orbital_position);
                        feparm.inversion,
                        feparm.fec,
                        feparm.orbital_position);

+#endif

                parm_u_qpsk_symbol_rate = feparm.symbol_rate;
                switch (feparm.inversion)
                {
                parm_u_qpsk_symbol_rate = feparm.symbol_rate;
                switch (feparm.inversion)
                {

-                       case eDVBFrontendParametersSatellite::Inversion::On:
+                       case eDVBFrontendParametersSatellite::Inversion_On:

                                parm_inversion = INVERSION_ON;
                                break;
                                parm_inversion = INVERSION_ON;
                                break;

-                       case eDVBFrontendParametersSatellite::Inversion::Off:
+                       case eDVBFrontendParametersSatellite::Inversion_Off:

                                parm_inversion = INVERSION_OFF;
                                break;
                        default:
                                parm_inversion = INVERSION_OFF;
                                break;
                        default:

-                       case eDVBFrontendParametersSatellite::Inversion::Unknown:
+                       case eDVBFrontendParametersSatellite::Inversion_Unknown:

                                parm_inversion = INVERSION_AUTO;
                                break;
                }
                                parm_inversion = INVERSION_AUTO;
                                break;
                }

-               if (feparm.system == eDVBFrontendParametersSatellite::System::DVB_S)
+               if (feparm.system == eDVBFrontendParametersSatellite::System_DVB_S)
+               {

                        switch (feparm.fec)
                        {
                        switch (feparm.fec)
                        {

-                               case eDVBFrontendParametersSatellite::FEC::fNone:
+                               case eDVBFrontendParametersSatellite::FEC_None:

                                        parm_u_qpsk_fec_inner = FEC_NONE;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_NONE;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f1_2:
+                               case eDVBFrontendParametersSatellite::FEC_1_2:

                                        parm_u_qpsk_fec_inner = FEC_1_2;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_1_2;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f2_3:
+                               case eDVBFrontendParametersSatellite::FEC_2_3:

                                        parm_u_qpsk_fec_inner = FEC_2_3;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_2_3;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f3_4:
+                               case eDVBFrontendParametersSatellite::FEC_3_4:

                                        parm_u_qpsk_fec_inner = FEC_3_4;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_3_4;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f5_6:
+                               case eDVBFrontendParametersSatellite::FEC_5_6:

                                        parm_u_qpsk_fec_inner = FEC_5_6;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_5_6;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f7_8:
+                               case eDVBFrontendParametersSatellite::FEC_7_8:

                                        parm_u_qpsk_fec_inner = FEC_7_8;
                                        break;
                                default:
                                        parm_u_qpsk_fec_inner = FEC_7_8;
                                        break;
                                default:

-                                       eDebug("no valid fec for DVB-S set.. assume auto");
-                               case eDVBFrontendParametersSatellite::FEC::fAuto:
+                                       eDebugNoSimulate("no valid fec for DVB-S set.. assume auto");
+                               case eDVBFrontendParametersSatellite::FEC_Auto:

                                        parm_u_qpsk_fec_inner = FEC_AUTO;
                                        break;
                        }
                                        parm_u_qpsk_fec_inner = FEC_AUTO;
                                        break;
                        }

+               }

 #if HAVE_DVB_API_VERSION >= 3
                else // DVB_S2
                {
                        switch (feparm.fec)
                        {
 #if HAVE_DVB_API_VERSION >= 3
                else // DVB_S2
                {
                        switch (feparm.fec)
                        {

-                               case eDVBFrontendParametersSatellite::FEC::f1_2:
+                               case eDVBFrontendParametersSatellite::FEC_1_2:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f2_3:
+                               case eDVBFrontendParametersSatellite::FEC_2_3:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f3_4:
+                               case eDVBFrontendParametersSatellite::FEC_3_4:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f3_5:
+                               case eDVBFrontendParametersSatellite::FEC_3_5:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f4_5:
+                               case eDVBFrontendParametersSatellite::FEC_4_5:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f5_6:
+                               case eDVBFrontendParametersSatellite::FEC_5_6:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f7_8:
+                               case eDVBFrontendParametersSatellite::FEC_7_8:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f8_9:
+                               case eDVBFrontendParametersSatellite::FEC_8_9:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9;
                                        break;
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9;
                                        break;

-                               case eDVBFrontendParametersSatellite::FEC::f9_10:
+                               case eDVBFrontendParametersSatellite::FEC_9_10:

                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_9_10;
                                        break;
                                default:
                                        parm_u_qpsk_fec_inner = FEC_S2_QPSK_9_10;
                                        break;
                                default:

-                                       eDebug("no valid fec for DVB-S2 set.. abort !!");
+                                       eDebugNoSimulate("no valid fec for DVB-S2 set.. abort !!");

                                        return -EINVAL;
                        }
                                        return -EINVAL;
                        }

-                       if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+#if HAVE_DVB_API_VERSION < 5
+                       parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff
+                       parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot
+                       if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation_8PSK) 
+                       {

                                parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
                                // 8PSK fec driver values are decimal 9 bigger
                                parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
                                // 8PSK fec driver values are decimal 9 bigger

+                       }
+#endif

                }
 #endif
                // FIXME !!! get frequency range from tuner
                if ( parm_frequency < 900000 || parm_frequency > 2200000 )
                {
                }
 #endif
                // FIXME !!! get frequency range from tuner
                if ( parm_frequency < 900000 || parm_frequency > 2200000 )
                {

-                       eDebug("%d mhz out of tuner range.. dont tune", parm_frequency/1000);
+                       eDebugNoSimulate("%d mhz out of tuner range.. dont tune", parm_frequency/1000);

                        return -EINVAL;
                }
                        return -EINVAL;
                }

-               eDebug("tuning to %d mhz", parm_frequency/1000);
+               eDebugNoSimulate("tuning to %d mhz", parm_frequency/1000);

        }
        }

+       oparm.sat = feparm;

        return res;
 }
 
 RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
 {
        return res;
 }
 
 RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
 {

+#if HAVE_DVB_API_VERSION < 3
+       parm_frequency = feparm.frequency;
+#else

        parm_frequency = feparm.frequency * 1000;
        parm_frequency = feparm.frequency * 1000;

+#endif

        parm_u_qam_symbol_rate = feparm.symbol_rate;
        switch (feparm.modulation)
        {
        parm_u_qam_symbol_rate = feparm.symbol_rate;
        switch (feparm.modulation)
        {

-       case eDVBFrontendParametersCable::Modulation::QAM16:
+       case eDVBFrontendParametersCable::Modulation_QAM16:

                parm_u_qam_modulation = QAM_16;
                break;
                parm_u_qam_modulation = QAM_16;
                break;

-       case eDVBFrontendParametersCable::Modulation::QAM32:
+       case eDVBFrontendParametersCable::Modulation_QAM32:

                parm_u_qam_modulation = QAM_32;
                break;
                parm_u_qam_modulation = QAM_32;
                break;

-       case eDVBFrontendParametersCable::Modulation::QAM64:
+       case eDVBFrontendParametersCable::Modulation_QAM64:

                parm_u_qam_modulation = QAM_64;
                break;
                parm_u_qam_modulation = QAM_64;
                break;

-       case eDVBFrontendParametersCable::Modulation::QAM128:
+       case eDVBFrontendParametersCable::Modulation_QAM128:

                parm_u_qam_modulation = QAM_128;
                break;
                parm_u_qam_modulation = QAM_128;
                break;

-       case eDVBFrontendParametersCable::Modulation::QAM256:
+       case eDVBFrontendParametersCable::Modulation_QAM256:

                parm_u_qam_modulation = QAM_256;
                break;
        default:
                parm_u_qam_modulation = QAM_256;
                break;
        default:

-       case eDVBFrontendParametersCable::Modulation::Auto:
+       case eDVBFrontendParametersCable::Modulation_Auto:

                parm_u_qam_modulation = QAM_AUTO;
                break;
        }
        switch (feparm.inversion)
        {
                parm_u_qam_modulation = QAM_AUTO;
                break;
        }
        switch (feparm.inversion)
        {

-       case eDVBFrontendParametersCable::Inversion::On:
+       case eDVBFrontendParametersCable::Inversion_On:

                parm_inversion = INVERSION_ON;
                break;
                parm_inversion = INVERSION_ON;
                break;

-       case eDVBFrontendParametersCable::Inversion::Off:
+       case eDVBFrontendParametersCable::Inversion_Off:

                parm_inversion = INVERSION_OFF;
                break;
        default:
                parm_inversion = INVERSION_OFF;
                break;
        default:

-       case eDVBFrontendParametersCable::Inversion::Unknown:
+       case eDVBFrontendParametersCable::Inversion_Unknown:

                parm_inversion = INVERSION_AUTO;
                break;
        }
        switch (feparm.fec_inner)
        {
                parm_inversion = INVERSION_AUTO;
                break;
        }
        switch (feparm.fec_inner)
        {

-       case eDVBFrontendParametersCable::FEC::fNone:
+       case eDVBFrontendParametersCable::FEC_None:

                parm_u_qam_fec_inner = FEC_NONE;
                break;
                parm_u_qam_fec_inner = FEC_NONE;
                break;

-       case eDVBFrontendParametersCable::FEC::f1_2:
+       case eDVBFrontendParametersCable::FEC_1_2:

                parm_u_qam_fec_inner = FEC_1_2;
                break;
                parm_u_qam_fec_inner = FEC_1_2;
                break;

-       case eDVBFrontendParametersCable::FEC::f2_3:
+       case eDVBFrontendParametersCable::FEC_2_3:

                parm_u_qam_fec_inner = FEC_2_3;
                break;
                parm_u_qam_fec_inner = FEC_2_3;
                break;

-       case eDVBFrontendParametersCable::FEC::f3_4:
+       case eDVBFrontendParametersCable::FEC_3_4:

                parm_u_qam_fec_inner = FEC_3_4;
                break;
                parm_u_qam_fec_inner = FEC_3_4;
                break;

-       case eDVBFrontendParametersCable::FEC::f5_6:
+       case eDVBFrontendParametersCable::FEC_5_6:

                parm_u_qam_fec_inner = FEC_5_6;
                break;
                parm_u_qam_fec_inner = FEC_5_6;
                break;

-       case eDVBFrontendParametersCable::FEC::f7_8:
+       case eDVBFrontendParametersCable::FEC_7_8:

                parm_u_qam_fec_inner = FEC_7_8;
                break;
 #if HAVE_DVB_API_VERSION >= 3
                parm_u_qam_fec_inner = FEC_7_8;
                break;
 #if HAVE_DVB_API_VERSION >= 3

-       case eDVBFrontendParametersCable::FEC::f8_9:
+       case eDVBFrontendParametersCable::FEC_8_9:

                parm_u_qam_fec_inner = FEC_8_9;
                break;
 #endif
        default:
                parm_u_qam_fec_inner = FEC_8_9;
                break;
 #endif
        default:

-       case eDVBFrontendParametersCable::FEC::fAuto:
+       case eDVBFrontendParametersCable::FEC_Auto:

                parm_u_qam_fec_inner = FEC_AUTO;
                break;
        }
                parm_u_qam_fec_inner = FEC_AUTO;
                break;
        }

-       eDebug("tuning to %d khz, sr %d, fec %d, modulation %d, inversion %d",
+       eDebugNoSimulate("tuning to %d khz, sr %d, fec %d, modulation %d, inversion %d",

                parm_frequency/1000,
                parm_u_qam_symbol_rate,
                parm_u_qam_fec_inner,
                parm_u_qam_modulation,
                parm_inversion);
                parm_frequency/1000,
                parm_u_qam_symbol_rate,
                parm_u_qam_fec_inner,
                parm_u_qam_modulation,
                parm_inversion);

+       oparm.cab = feparm;

        return 0;
 }
 
        return 0;
 }
 


@@ -1705,156 +2148,158 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
 
        switch (feparm.bandwidth)
        {
 
        switch (feparm.bandwidth)
        {

-       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz:
+       case eDVBFrontendParametersTerrestrial::Bandwidth_8MHz:

                parm_u_ofdm_bandwidth = BANDWIDTH_8_MHZ;
                break;
                parm_u_ofdm_bandwidth = BANDWIDTH_8_MHZ;
                break;

-       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz:
+       case eDVBFrontendParametersTerrestrial::Bandwidth_7MHz:

                parm_u_ofdm_bandwidth = BANDWIDTH_7_MHZ;
                break;
                parm_u_ofdm_bandwidth = BANDWIDTH_7_MHZ;
                break;

-       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz:
+       case eDVBFrontendParametersTerrestrial::Bandwidth_6MHz:

                parm_u_ofdm_bandwidth = BANDWIDTH_6_MHZ;
                break;
        default:
                parm_u_ofdm_bandwidth = BANDWIDTH_6_MHZ;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto:
+       case eDVBFrontendParametersTerrestrial::Bandwidth_Auto:

                parm_u_ofdm_bandwidth = BANDWIDTH_AUTO;
                break;
        }
        switch (feparm.code_rate_LP)
        {
                parm_u_ofdm_bandwidth = BANDWIDTH_AUTO;
                break;
        }
        switch (feparm.code_rate_LP)
        {

-       case eDVBFrontendParametersTerrestrial::FEC::f1_2:
+       case eDVBFrontendParametersTerrestrial::FEC_1_2:

                parm_u_ofdm_code_rate_LP = FEC_1_2;
                break;
                parm_u_ofdm_code_rate_LP = FEC_1_2;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f2_3:
+       case eDVBFrontendParametersTerrestrial::FEC_2_3:

                parm_u_ofdm_code_rate_LP = FEC_2_3;
                break;
                parm_u_ofdm_code_rate_LP = FEC_2_3;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f3_4:
+       case eDVBFrontendParametersTerrestrial::FEC_3_4:

                parm_u_ofdm_code_rate_LP = FEC_3_4;
                break;
                parm_u_ofdm_code_rate_LP = FEC_3_4;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f5_6:
+       case eDVBFrontendParametersTerrestrial::FEC_5_6:

                parm_u_ofdm_code_rate_LP = FEC_5_6;
                break;
                parm_u_ofdm_code_rate_LP = FEC_5_6;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f7_8:
+       case eDVBFrontendParametersTerrestrial::FEC_7_8:

                parm_u_ofdm_code_rate_LP = FEC_7_8;
                break;
        default:
                parm_u_ofdm_code_rate_LP = FEC_7_8;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::FEC::fAuto:
+       case eDVBFrontendParametersTerrestrial::FEC_Auto:

                parm_u_ofdm_code_rate_LP = FEC_AUTO;
                break;
        }
        switch (feparm.code_rate_HP)
        {
                parm_u_ofdm_code_rate_LP = FEC_AUTO;
                break;
        }
        switch (feparm.code_rate_HP)
        {

-       case eDVBFrontendParametersTerrestrial::FEC::f1_2:
+       case eDVBFrontendParametersTerrestrial::FEC_1_2:

                parm_u_ofdm_code_rate_HP = FEC_1_2;
                break;
                parm_u_ofdm_code_rate_HP = FEC_1_2;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f2_3:
+       case eDVBFrontendParametersTerrestrial::FEC_2_3:

                parm_u_ofdm_code_rate_HP = FEC_2_3;
                break;
                parm_u_ofdm_code_rate_HP = FEC_2_3;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f3_4:
+       case eDVBFrontendParametersTerrestrial::FEC_3_4:

                parm_u_ofdm_code_rate_HP = FEC_3_4;
                break;
                parm_u_ofdm_code_rate_HP = FEC_3_4;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f5_6:
+       case eDVBFrontendParametersTerrestrial::FEC_5_6:

                parm_u_ofdm_code_rate_HP = FEC_5_6;
                break;
                parm_u_ofdm_code_rate_HP = FEC_5_6;
                break;

-       case eDVBFrontendParametersTerrestrial::FEC::f7_8:
+       case eDVBFrontendParametersTerrestrial::FEC_7_8:

                parm_u_ofdm_code_rate_HP = FEC_7_8;
                break;
        default:
                parm_u_ofdm_code_rate_HP = FEC_7_8;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::FEC::fAuto:
+       case eDVBFrontendParametersTerrestrial::FEC_Auto:

                parm_u_ofdm_code_rate_HP = FEC_AUTO;
                break;
        }
        switch (feparm.modulation)
        {
                parm_u_ofdm_code_rate_HP = FEC_AUTO;
                break;
        }
        switch (feparm.modulation)
        {

-       case eDVBFrontendParametersTerrestrial::Modulation::QPSK:
+       case eDVBFrontendParametersTerrestrial::Modulation_QPSK:

                parm_u_ofdm_constellation = QPSK;
                break;
                parm_u_ofdm_constellation = QPSK;
                break;

-       case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
+       case eDVBFrontendParametersTerrestrial::Modulation_QAM16:

                parm_u_ofdm_constellation = QAM_16;
                break;
                parm_u_ofdm_constellation = QAM_16;
                break;

-       case eDVBFrontendParametersTerrestrial::Modulation::QAM64:
+       case eDVBFrontendParametersTerrestrial::Modulation_QAM64:

                parm_u_ofdm_constellation = QAM_64;
                break;
        default:
                parm_u_ofdm_constellation = QAM_64;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::Modulation::Auto:
+       case eDVBFrontendParametersTerrestrial::Modulation_Auto:

                parm_u_ofdm_constellation = QAM_AUTO;
                break;
        }
        switch (feparm.transmission_mode)
        {
                parm_u_ofdm_constellation = QAM_AUTO;
                break;
        }
        switch (feparm.transmission_mode)
        {

-       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k:
+       case eDVBFrontendParametersTerrestrial::TransmissionMode_2k:

                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_2K;
                break;
                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_2K;
                break;

-       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k:
+       case eDVBFrontendParametersTerrestrial::TransmissionMode_8k:

                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_8K;
                break;
        default:
                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_8K;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto:
+       case eDVBFrontendParametersTerrestrial::TransmissionMode_Auto:

                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_AUTO;
                break;
        }
        switch (feparm.guard_interval)
        {
                parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_AUTO;
                break;
        }
        switch (feparm.guard_interval)
        {

-               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32:
+               case eDVBFrontendParametersTerrestrial::GuardInterval_1_32:

                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_32;
                        break;
                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_32;
                        break;

-               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16:
+               case eDVBFrontendParametersTerrestrial::GuardInterval_1_16:

                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_16;
                        break;
                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_16;
                        break;

-               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8:
+               case eDVBFrontendParametersTerrestrial::GuardInterval_1_8:

                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_8;
                        break;
                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_8;
                        break;

-               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4:
+               case eDVBFrontendParametersTerrestrial::GuardInterval_1_4:

                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_4;
                        break;
                default:
                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_4;
                        break;
                default:

-               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto:
+               case eDVBFrontendParametersTerrestrial::GuardInterval_Auto:

                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_AUTO;
                        break;
        }
        switch (feparm.hierarchy)
        {
                        parm_u_ofdm_guard_interval = GUARD_INTERVAL_AUTO;
                        break;
        }
        switch (feparm.hierarchy)
        {

-               case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+               case eDVBFrontendParametersTerrestrial::Hierarchy_None:

                        parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
                        break;
                        parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
                        break;

-               case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
+               case eDVBFrontendParametersTerrestrial::Hierarchy_1:

                        parm_u_ofdm_hierarchy_information = HIERARCHY_1;
                        break;
                        parm_u_ofdm_hierarchy_information = HIERARCHY_1;
                        break;

-               case eDVBFrontendParametersTerrestrial::Hierarchy::H2:
+               case eDVBFrontendParametersTerrestrial::Hierarchy_2:

                        parm_u_ofdm_hierarchy_information = HIERARCHY_2;
                        break;
                        parm_u_ofdm_hierarchy_information = HIERARCHY_2;
                        break;

-               case eDVBFrontendParametersTerrestrial::Hierarchy::H4:
+               case eDVBFrontendParametersTerrestrial::Hierarchy_4:

                        parm_u_ofdm_hierarchy_information = HIERARCHY_4;
                        break;
                default:
                        parm_u_ofdm_hierarchy_information = HIERARCHY_4;
                        break;
                default:

-               case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto:
+               case eDVBFrontendParametersTerrestrial::Hierarchy_Auto:

                        parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
                        break;
        }
        switch (feparm.inversion)
        {
                        parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
                        break;
        }
        switch (feparm.inversion)
        {

-       case eDVBFrontendParametersTerrestrial::Inversion::On:
+       case eDVBFrontendParametersTerrestrial::Inversion_On:

                parm_inversion = INVERSION_ON;
                break;
                parm_inversion = INVERSION_ON;
                break;

-       case eDVBFrontendParametersTerrestrial::Inversion::Off:
+       case eDVBFrontendParametersTerrestrial::Inversion_Off:

                parm_inversion = INVERSION_OFF;
                break;
        default:
                parm_inversion = INVERSION_OFF;
                break;
        default:

-       case eDVBFrontendParametersTerrestrial::Inversion::Unknown:
+       case eDVBFrontendParametersTerrestrial::Inversion_Unknown:

                parm_inversion = INVERSION_AUTO;
                break;
        }
                parm_inversion = INVERSION_AUTO;
                break;
        }

+       oparm.ter = feparm;

        return 0;
 }
 
 RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
        return 0;
 }
 
 RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {

-       eDebug("(%d)tune", m_dvbid);
+       unsigned int timeout = 5000;
+       eDebugNoSimulate("(%d)tune", m_dvbid);

 
        m_timeout->stop();
 
        int res=0;
 
 
        m_timeout->stop();
 
        int res=0;
 

-       if (!m_sn)
+       if (!m_sn && !m_simulate)

        {
                eDebug("no frontend device opened... do not try to tune !!!");
                res = -ENODEV;
        {
                eDebug("no frontend device opened... do not try to tune !!!");
                res = -ENODEV;


@@ -1867,9 +2312,13 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                goto tune_error;
        }
 
                goto tune_error;
        }
 

-       m_sn->stop();
+       if (!m_simulate)
+               m_sn->stop();
+

        m_sec_sequence.clear();
 
        m_sec_sequence.clear();
 

+       where.calcLockTimeout(timeout);
+

        switch (m_type)
        {
        case feSatellite:
        switch (m_type)
        {
        case feSatellite:


@@ -1881,8 +2330,9 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        res = -EINVAL;
                        goto tune_error;
                }
                        res = -EINVAL;
                        goto tune_error;
                }

-               m_sec->setRotorMoving(false);
-               res=prepare_sat(feparm);
+               if (!m_simulate)
+                       m_sec->setRotorMoving(false);
+               res=prepare_sat(feparm, timeout);

                if (res)
                        goto tune_error;
 
                if (res)
                        goto tune_error;
 


@@ -1900,8 +2350,8 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                if (res)
                        goto tune_error;
 
                if (res)
                        goto tune_error;
 

-               m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
-               m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, timeout) );
+               m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );

                break;
        }
        case feTerrestrial:
                break;
        }
        case feTerrestrial:


@@ -1920,27 +2370,32 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                std::string enable_5V;
                char configStr[255];
                snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_slotid);
                std::string enable_5V;
                char configStr[255];
                snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_slotid);

-               m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+               m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, timeout) );

                ePythonConfigQuery::getConfigValue(configStr, enable_5V);
                if (enable_5V == "True")
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
                else
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
                ePythonConfigQuery::getConfigValue(configStr, enable_5V);
                if (enable_5V == "True")
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
                else
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );

-               m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );

 
                break;
        }
        }
 
 
                break;
        }
        }
 

-       m_tuneTimer->start(0,true);

        m_sec_sequence.current() = m_sec_sequence.begin();
 
        m_sec_sequence.current() = m_sec_sequence.begin();
 

-       if (m_state != stateTuning)
+       if (!m_simulate)

        {
        {

-               m_tuning = 1;
-               m_state = stateTuning;
-               m_stateChanged(this);
+               m_tuneTimer->start(0,true);
+               if (m_state != stateTuning)
+               {
+                       m_tuning = 1;
+                       m_state = stateTuning;
+                       m_stateChanged(this);
+               }

        }
        }

+       else
+               tuneLoop();

 
        return res;
 
 
        return res;
 


@@ -1969,8 +2424,7 @@ RESULT eDVBFrontend::setVoltage(int voltage)
        switch (voltage)
        {
        case voltageOff:
        switch (voltage)
        {
        case voltageOff:

-               for (int i=0; i < 3; ++i)  // reset diseqc
-                       m_data[i]=-1;
+               m_data[CSW]=m_data[UCSW]=m_data[TONEBURST]=-1; // reset diseqc

                vlt = SEC_VOLTAGE_OFF;
                break;
        case voltage13_5:
                vlt = SEC_VOLTAGE_OFF;
                break;
        case voltage13_5:


@@ -1996,6 +2450,8 @@ RESULT eDVBFrontend::setVoltage(int voltage)
        default:
                return -ENODEV;
        }
        default:
                return -ENODEV;
        }

+       if (m_simulate)
+               return 0;

 #if HAVE_DVB_API_VERSION < 3
        return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt);
 #else
 #if HAVE_DVB_API_VERSION < 3
        return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt);
 #else


@@ -2032,6 +2488,8 @@ RESULT eDVBFrontend::setTone(int t)
        default:
                return -ENODEV;
        }
        default:
                return -ENODEV;
        }

+       if (m_simulate)
+               return 0;

 #if HAVE_DVB_API_VERSION < 3   
        return ::ioctl(m_secfd, SEC_SET_TONE, tone);
 #else  
 #if HAVE_DVB_API_VERSION < 3   
        return ::ioctl(m_secfd, SEC_SET_TONE, tone);
 #else  


@@ -2045,6 +2503,8 @@ RESULT eDVBFrontend::setTone(int t)
 
 RESULT eDVBFrontend::sendDiseqc(const eDVBDiseqcCommand &diseqc)
 {
 
 RESULT eDVBFrontend::sendDiseqc(const eDVBDiseqcCommand &diseqc)
 {

+       if (m_simulate)
+               return 0;

 #if HAVE_DVB_API_VERSION < 3
        struct secCommand cmd;
        cmd.type = SEC_CMDTYPE_DISEQC_RAW;
 #if HAVE_DVB_API_VERSION < 3
        struct secCommand cmd;
        cmd.type = SEC_CMDTYPE_DISEQC_RAW;


@@ -2069,6 +2529,8 @@ RESULT eDVBFrontend::sendDiseqc(const eDVBDiseqcCommand &diseqc)
 #endif
 RESULT eDVBFrontend::sendToneburst(int burst)
 {
 #endif
 RESULT eDVBFrontend::sendToneburst(int burst)
 {

+       if (m_simulate)
+               return 0;

 #if HAVE_DVB_API_VERSION < 3
        secMiniCmd cmd = SEC_MINI_NONE;
 #else
 #if HAVE_DVB_API_VERSION < 3
        secMiniCmd cmd = SEC_MINI_NONE;
 #else


@@ -2100,7 +2562,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBFrontend::getData(int num, int &data)
+RESULT eDVBFrontend::getData(int num, long &data)

 {
        if ( num < NUM_DATA_ENTRIES )
        {
 {
        if ( num < NUM_DATA_ENTRIES )
        {


@@ -2110,7 +2572,7 @@ RESULT eDVBFrontend::getData(int num, int &data)
        return -EINVAL;
 }
 
        return -EINVAL;
 }
 

-RESULT eDVBFrontend::setData(int num, int val)
+RESULT eDVBFrontend::setData(int num, long val)

 {
        if ( num < NUM_DATA_ENTRIES )
        {
 {
        if ( num < NUM_DATA_ENTRIES )
        {


@@ -2125,29 +2587,36 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
        int type;
        if (feparm->getSystem(type) || type != m_type || !m_enabled)
                return 0;
        int type;
        if (feparm->getSystem(type) || type != m_type || !m_enabled)
                return 0;

-

        if (m_type == eDVBFrontend::feSatellite)
        {
                ASSERT(m_sec);
                eDVBFrontendParametersSatellite sat_parm;
                int ret = feparm->getDVBS(sat_parm);
                ASSERT(!ret);
        if (m_type == eDVBFrontend::feSatellite)
        {
                ASSERT(m_sec);
                eDVBFrontendParametersSatellite sat_parm;
                int ret = feparm->getDVBS(sat_parm);
                ASSERT(!ret);

-               return m_sec->canTune(sat_parm, this, 1 << m_slotid);
+               if (sat_parm.system == eDVBFrontendParametersSatellite::System_DVB_S2 && !m_can_handle_dvbs2)
+                       return 0;
+               ret = m_sec->canTune(sat_parm, this, 1 << m_slotid);
+               if (ret > 1 && sat_parm.system == eDVBFrontendParametersSatellite::System_DVB_S && m_can_handle_dvbs2)
+                       ret -= 1;
+               return ret;

        }
        else if (m_type == eDVBFrontend::feCable)
                return 2;  // more prio for cable frontends
        }
        else if (m_type == eDVBFrontend::feCable)
                return 2;  // more prio for cable frontends

-       return 1;
+       else if (m_type == eDVBFrontend::feTerrestrial)
+               return 1;
+       return 0;

 }
 
 bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {
 }
 
 bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {

-       ePyObject Id, Descr, Enabled;
-       if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 3)
+       ePyObject Id, Descr, Enabled, IsDVBS2;
+       if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 4)

                goto arg_error;
        Id = PyTuple_GET_ITEM(obj, 0);
        Descr = PyTuple_GET_ITEM(obj, 1);
        Enabled = PyTuple_GET_ITEM(obj, 2);
                goto arg_error;
        Id = PyTuple_GET_ITEM(obj, 0);
        Descr = PyTuple_GET_ITEM(obj, 1);
        Enabled = PyTuple_GET_ITEM(obj, 2);

-       if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled))
+       IsDVBS2 = PyTuple_GET_ITEM(obj, 3);
+       if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2))

                goto arg_error;
        strcpy(m_description, PyString_AS_STRING(Descr));
        m_slotid = PyInt_AsLong(Id);
                goto arg_error;
        strcpy(m_description, PyString_AS_STRING(Descr));
        m_slotid = PyInt_AsLong(Id);


@@ -2155,12 +2624,53 @@ bool eDVBFrontend::setSlotInfo(ePyObject obj)
        // HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
        m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") ||
                !!strstr(m_description, "Alps BSBE2") ||
        // HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
        m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") ||
                !!strstr(m_description, "Alps BSBE2") ||

-               !!strstr(m_description, "Alps -S");
-       eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s",
-               m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No" );
+               !!strstr(m_description, "Alps -S") ||
+               !!strstr(m_description, "BCM4501");
+       m_can_handle_dvbs2 = IsDVBS2 == Py_True;
+       eDebugNoSimulate("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s, DVB-S2 %s",
+               m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No", m_can_handle_dvbs2 ? "Yes" : "No" );

        return true;
 arg_error:
        PyErr_SetString(PyExc_StandardError,
                "eDVBFrontend::setSlotInfo must get a tuple with first param slotid, second param slot description and third param enabled boolean");
        return false;
 }
        return true;
 arg_error:
        PyErr_SetString(PyExc_StandardError,
                "eDVBFrontend::setSlotInfo must get a tuple with first param slotid, second param slot description and third param enabled boolean");
        return false;
 }

+
+RESULT eDVBFrontend::turnOffSatCR(int satcr)
+{
+       eSecCommandList sec_sequence;
+       // check if voltage is disabled
+       eSecCommand::pair compare;
+       compare.steps = +9;     //nothing to do
+       compare.voltage = iDVBFrontend::voltageOff;
+       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50 ) );
+
+       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18_5) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );
+
+       eDVBDiseqcCommand diseqc;
+       memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+       diseqc.len = 5;
+       diseqc.data[0] = 0xE0;
+       diseqc.data[1] = 0x10;
+       diseqc.data[2] = 0x5A;
+       diseqc.data[3] = satcr << 5;
+       diseqc.data[4] = 0x00;
+
+       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50+20+14*diseqc.len) );
+       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+       setSecSequence(sec_sequence);
+       return 0;
+}
+
+RESULT eDVBFrontend::ScanSatCR()
+{
+       setFrontend();
+       usleep(20000);
+       setTone(iDVBFrontend::toneOff);
+       return 0;
+}