add lockState and syncState to getFrontendInfo call
[enigma2.git] / lib / dvb / frontend.cpp
index 630c0308026afd81f0d7b2ebfd5c21dbb3d438bc..5bb6aeb4890f83890daa436c95df34a4d4d2d279 100644 (file)
 #define BANDWIDTH_AUTO                 (BandWidth)3
 #define GUARD_INTERVAL_AUTO            (GuardInterval)4
 #define HIERARCHY_AUTO                 (Hierarchy)4
-#define constellation Constellation
-#define guard_interval guardInterval
-#define hierarchy_information HierarchyInformation
-#define code_rate_HP HP_CodeRate
-#define code_rate_LP LP_CodeRate
+#define parm.frequency parm.Frequency
+#define parm.u.qam.symbol_rate parm.u.qam.SymbolRate
+#define parm.u.qam.fec_inner parm.u.qam.FEC_inner
+#define parm.u.qam.modulation parm.u.qam.QAM
+#define parm.u.ofdm.bandwidth parm.u.ofdm.bandWidth
+#define parm.u.ofdm.code_rate_LP parm.u.ofdm.LP_CodeRate
+#define parm.u.ofdm.code_rate_HP parm.u.ofdm.HP_CodeRate
+#define parm.u.ofdm.constellation parm.u.ofdm.Constellation
+#define parm.u.ofdm.transmission_mode parm.u.ofdm.TransmissionMode
+#define parm.u.ofdm.guard_interval parm.u.ofdm.guardInterval
+#define parm.u.ofdm.hierarchy_information parm.u.ofdm.HierarchyInformation
+#define parm.inversion parm.Inversion
 #else
 #include <linux/dvb/frontend.h>
 #endif
@@ -34,45 +41,10 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
 {
        frequency    = descriptor.getFrequency() * 10;
        symbol_rate  = descriptor.getSymbolRate() * 100;
-       switch (descriptor.getPolarization())
-       {
-       case 0:
-               polarisation = Polarisation::Horizontal;
-               break;
-       case 1:
-               polarisation = Polarisation::Vertical;
-               break;
-       case 2:
-               polarisation = Polarisation::CircularLeft;
-               break;
-       case 3:
-               polarisation = Polarisation::CircularRight;
-               break;
-       }
-       switch (descriptor.getFecInner())
-       {
-       case 1:
-               fec = FEC::f1_2;
-               break;
-       case 2:
-               fec = FEC::f2_3;
-               break;
-       case 3:
-               fec = FEC::f3_4;
-               break;
-       case 4:
-               fec = FEC::f5_6;
-               break;
-       case 5:
-               fec = FEC::f7_8;
-               break;
-       case 0xF:
+       polarisation = descriptor.getPolarization();
+       fec = descriptor.getFecInner();
+       if ( fec == 0xF )
                fec = FEC::fNone;
-               break;
-       default:
-               fec = FEC::fAuto;
-               break;
-       }
        inversion = Inversion::Unknown;
        orbital_position  = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
        orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
@@ -80,16 +52,55 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
        orbital_position += ((descriptor.getOrbitalPosition()) & 0xF);
        if (orbital_position && (!descriptor.getWestEastFlag()))
                orbital_position = 3600 - orbital_position;
+       eDebug("SAT freq %d, %s, pos %d, sr %d, fec %d",
+               frequency,
+               polarisation ? "hor" : "vert",
+               orbital_position,
+               symbol_rate, fec);
 }
 
 void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descriptor)
 {
-       eFatal("nyi");
+       frequency = descriptor.getFrequency() / 10;
+       symbol_rate = descriptor.getSymbolRate() * 100;
+       fec_inner = descriptor.getFecInner();
+       if ( fec_inner == 0xF )
+               fec_inner = FEC::fNone;
+       modulation = descriptor.getModulation();
+       if ( modulation > 0x5 )
+               modulation = Modulation::Auto;
+       inversion = Inversion::Unknown;
+       eDebug("Cable freq %d, mod %d, sr %d, fec %d",
+               frequency,
+               modulation, symbol_rate, fec_inner);
 }
 
-void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescriptor  &)
+void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescriptor &descriptor)
 {
-       eFatal("nyi");
+       frequency = descriptor.getCentreFrequency() * 10;
+       bandwidth = descriptor.getBandwidth();
+       if ( bandwidth > 2 ) // 5Mhz forced to auto
+               bandwidth = Bandwidth::BwAuto;
+       code_rate_HP = descriptor.getCodeRateHpStream();
+       if (code_rate_HP > 4)
+               code_rate_HP = FEC::fAuto;
+       code_rate_LP = descriptor.getCodeRateLpStream();
+       if (code_rate_LP > 4)
+               code_rate_LP = FEC::fAuto;
+       transmission_mode = descriptor.getTransmissionMode();
+       if (transmission_mode > 2)
+               transmission_mode = TransmissionMode::TMAuto;
+       guard_interval = descriptor.getGuardInterval();
+       if (guard_interval > 3)
+               guard_interval = GuardInterval::GI_Auto;
+       hierarchy = descriptor.getHierarchyInformation()&3;
+       modulation = descriptor.getConstellation();
+       if (modulation > 2)
+               modulation = Modulation::Auto;
+       inversion = 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);
 }
 
 eDVBFrontendParameters::eDVBFrontendParameters(): m_type(-1)
@@ -184,7 +195,29 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
                return 0;
        }
        case iDVBFrontend::feCable:
+               eDVBFrontendParametersCable ocable;
+               if (parm->getDVBC(ocable))
+                       return -2;
+               
+               if (cable.modulation != ocable.modulation && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto)
+                       diff = 1 << 29;
+               else if (cable.inversion != ocable.inversion && cable.inversion != eDVBFrontendParametersCable::Inversion::Unknown && ocable.inversion != eDVBFrontendParametersCable::Inversion::Unknown)
+                       diff = 1 << 28;
+               else
+               {
+                       diff = abs(cable.frequency - ocable.frequency);
+                       diff += abs(cable.symbol_rate - ocable.symbol_rate);
+               }
+               
+               return 0;
        case iDVBFrontend::feTerrestrial:
+               eDVBFrontendParametersTerrestrial oterrestrial;
+               if (parm->getDVBT(oterrestrial))
+                       return -2;
+               
+               diff = abs(terrestrial.frequency - oterrestrial.frequency);
+
+               return 0;
        default:
                return -1;
        }
@@ -445,10 +478,38 @@ int eDVBFrontend::readFrontendData(int type)
                                eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)");
                        return strength;
                }
+               case Locked:
+               {
+#if HAVE_DVB_API_VERSION < 3
+                       FrontendStatus status=0;
+#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);
+               }
+               case Synced:
+               {
+#if HAVE_DVB_API_VERSION < 3
+                       FrontendStatus status=0;
+#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);
+               }
        }
        return 0;
 }
 
+PyObject *eDVBFrontend::readTransponderData()
+{
+       Py_INCREF(Py_None);
+       return Py_None;
+}
+
 #ifndef FP_IOCTL_GET_ID
 #define FP_IOCTL_GET_ID 0
 #endif
@@ -499,6 +560,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
        int delay=0;
        if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() )
        {
+//             eDebug("tuneLoop %d\n", m_sec_sequence.current()->cmd);
                switch (m_sec_sequence.current()->cmd)
                {
                        case eSecCommand::SLEEP:
@@ -553,6 +615,10 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                setFrontend();
                                ++m_sec_sequence.current();
                                break;
+                       case eSecCommand::START_TUNE_TIMEOUT:
+                               m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
+                               ++m_sec_sequence.current();
+                               break;
                        case eSecCommand::SET_TIMEOUT:
                                m_timeoutCount = m_sec_sequence.current()++->val;
                                eDebug("[SEC] set timeout %d", m_timeoutCount);
@@ -597,6 +663,31 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                ++m_sec_sequence.current();
                                break;
                        }
+                       case eSecCommand::IF_TUNER_LOCKED_GOTO:
+                       {
+                               eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
+                               if (readFrontendData(Locked))
+                               {
+                                       eDebug("[SEC] locked step %d ok", cmd.okcount);
+                                       ++cmd.okcount;
+                                       if (cmd.okcount > 12)
+                                       {
+                                               eDebug("ok > 12 .. goto %d\n",m_sec_sequence.current()->steps);
+                                               setSecSequencePos(cmd.steps);
+                                               break;
+                                       }
+                               }
+                               else
+                               {
+                                       eDebug("[SEC] rotor locked step %d failed", cmd.okcount);
+                                       --m_timeoutCount;
+                                       if (!m_timeoutCount && m_retryCount > 0)
+                                               --m_retryCount;
+                                       cmd.okcount=0;
+                               }
+                               ++m_sec_sequence.current();
+                               break;
+                       }
                        case eSecCommand::MEASURE_RUNNING_INPUTPOWER:
                                m_runningInputpower = readInputpower();
                                eDebug("[SEC] runningInputpower is %d", m_runningInputpower);
@@ -708,7 +799,6 @@ void eDVBFrontend::setFrontend()
                perror("FE_SET_FRONTEND failed");
                return;
        }
-       m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
 }
 
 RESULT eDVBFrontend::getFrontendType(int &t)
@@ -719,10 +809,226 @@ RESULT eDVBFrontend::getFrontendType(int &t)
        return 0;
 }
 
+RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
+{
+       int res;
+       if (!m_sec)
+       {
+               eWarning("no SEC module active!");
+               return -ENOENT;
+       }
+       res = m_sec->prepare(*this, parm, feparm, 1 << m_fe);
+       if (!res)
+               eDebug("tuning to %d mhz", parm.frequency/1000);
+       return res;
+}
+
+RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
+{
+       parm.frequency = feparm.frequency * 1000;
+       parm.u.qam.symbol_rate = feparm.symbol_rate;
+       switch (feparm.modulation)
+       {
+       case eDVBFrontendParametersCable::Modulation::QAM16:
+               parm.u.qam.modulation = QAM_16;
+               break;
+       case eDVBFrontendParametersCable::Modulation::QAM32:
+               parm.u.qam.modulation = QAM_32;
+               break;
+       case eDVBFrontendParametersCable::Modulation::QAM64:
+               parm.u.qam.modulation = QAM_64;
+               break;
+       case eDVBFrontendParametersCable::Modulation::QAM128:
+               parm.u.qam.modulation = QAM_128;
+               break;
+       case eDVBFrontendParametersCable::Modulation::QAM256:
+               parm.u.qam.modulation = QAM_256;
+               break;
+       default:
+       case eDVBFrontendParametersCable::Modulation::Auto:
+               parm.u.qam.modulation = QAM_AUTO;
+               break;
+       }
+       switch (feparm.inversion)
+       {
+       case eDVBFrontendParametersCable::Inversion::On:
+               parm.inversion = INVERSION_ON;
+               break;
+       case eDVBFrontendParametersCable::Inversion::Off:
+               parm.inversion = INVERSION_OFF;
+               break;
+       default:
+       case eDVBFrontendParametersCable::Inversion::Unknown:
+               parm.inversion = INVERSION_AUTO;
+               break;
+       }
+       switch (feparm.fec_inner)
+       {
+       case eDVBFrontendParametersCable::FEC::fNone:
+               parm.u.qam.fec_inner = FEC_NONE;
+               break;
+       case eDVBFrontendParametersCable::FEC::f1_2:
+               parm.u.qam.fec_inner = FEC_1_2;
+               break;
+       case eDVBFrontendParametersCable::FEC::f2_3:
+               parm.u.qam.fec_inner = FEC_2_3;
+               break;
+       case eDVBFrontendParametersCable::FEC::f3_4:
+               parm.u.qam.fec_inner = FEC_3_4;
+               break;
+       case eDVBFrontendParametersCable::FEC::f5_6:
+               parm.u.qam.fec_inner = FEC_5_6;
+               break;
+       case eDVBFrontendParametersCable::FEC::f7_8:
+               parm.u.qam.fec_inner = FEC_7_8;
+               break;
+       case eDVBFrontendParametersCable::FEC::f8_9:
+               parm.u.qam.fec_inner = FEC_8_9;
+               break;
+       default:
+       case eDVBFrontendParametersCable::FEC::fAuto:
+               parm.u.qam.fec_inner = FEC_AUTO;
+               break;
+       }
+       return 0;
+}
+
+RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial &feparm)
+{
+       parm.frequency = feparm.frequency;
+
+       switch (feparm.bandwidth)
+       {
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz:
+               parm.u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+               break;
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz:
+               parm.u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+               break;
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz:
+               parm.u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+               break;
+       default:
+       case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto:
+               parm.u.ofdm.bandwidth = BANDWIDTH_AUTO;
+               break;
+       }
+       switch (feparm.code_rate_LP)
+       {
+       case eDVBFrontendParametersCable::FEC::f1_2:
+               parm.u.ofdm.code_rate_LP = FEC_1_2;
+               break;
+       case eDVBFrontendParametersCable::FEC::f2_3:
+               parm.u.ofdm.code_rate_LP = FEC_2_3;
+               break;
+       case eDVBFrontendParametersCable::FEC::f3_4:
+               parm.u.ofdm.code_rate_LP = FEC_3_4;
+               break;
+       case eDVBFrontendParametersCable::FEC::f5_6:
+               parm.u.ofdm.code_rate_LP = FEC_5_6;
+               break;
+       case eDVBFrontendParametersCable::FEC::f7_8:
+               parm.u.ofdm.code_rate_LP = FEC_7_8;
+               break;
+       default:
+       case eDVBFrontendParametersCable::FEC::fAuto:
+       case eDVBFrontendParametersCable::FEC::fNone:
+               parm.u.ofdm.code_rate_LP = FEC_AUTO;
+               break;
+       }
+       switch (feparm.code_rate_HP)
+       {
+       case eDVBFrontendParametersCable::FEC::f1_2:
+               parm.u.ofdm.code_rate_HP = FEC_1_2;
+               break;
+       case eDVBFrontendParametersCable::FEC::f2_3:
+               parm.u.ofdm.code_rate_HP = FEC_2_3;
+               break;
+       case eDVBFrontendParametersCable::FEC::f3_4:
+               parm.u.ofdm.code_rate_HP = FEC_3_4;
+               break;
+       case eDVBFrontendParametersCable::FEC::f5_6:
+               parm.u.ofdm.code_rate_HP = FEC_5_6;
+               break;
+       case eDVBFrontendParametersCable::FEC::f7_8:
+               parm.u.ofdm.code_rate_HP = FEC_7_8;
+               break;
+       default:
+       case eDVBFrontendParametersCable::FEC::fAuto:
+       case eDVBFrontendParametersCable::FEC::fNone:
+               parm.u.ofdm.code_rate_HP = FEC_AUTO;
+               break;
+       }
+       switch (feparm.modulation)
+       {
+       case eDVBFrontendParametersTerrestrial::Modulation::QPSK:
+               parm.u.ofdm.constellation = QPSK;
+               break;
+       case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
+               parm.u.ofdm.constellation = QAM_16;
+               break;
+       default:
+       case eDVBFrontendParametersTerrestrial::Modulation::Auto:
+               parm.u.ofdm.constellation = QAM_AUTO;
+               break;
+       }
+       switch (feparm.transmission_mode)
+       {
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k:
+               parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+               break;
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k:
+               parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
+               break;
+       default:
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto:
+               parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
+               break;
+       }
+       switch (feparm.guard_interval)
+       {
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32:
+                       parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+                       break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16:
+                       parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_16;
+                       break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8:
+                       parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_8;
+                       break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4:
+                       parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_4;
+                       break;
+               default:
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto:
+                       parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
+                       break;
+       }
+       switch (feparm.hierarchy)
+       {
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
+                       parm.u.ofdm.hierarchy_information = HIERARCHY_1;
+                       break;
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H2:
+                       parm.u.ofdm.hierarchy_information = HIERARCHY_2;
+                       break;
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H4:
+                       parm.u.ofdm.hierarchy_information = HIERARCHY_4;
+                       break;
+               default:
+               case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto:
+                       parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO;
+                       break;
+       }
+       return 0;
+}
+
 RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
        eDebug("(%d)tune", m_fe);
 
+       int res=0;
+
        if (m_type == -1)
                return -ENODEV;
 
@@ -734,139 +1040,23 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
        {
        case feSatellite:
        {
-               int res;
                eDVBFrontendParametersSatellite feparm;
                if (where.getDVBS(feparm))
                {
                        eDebug("no dvbs data!");
                        return -EINVAL;
                }
-               if (!m_sec)
-               {
-                       eWarning("no SEC module active!");
-                       return -ENOENT;
-               }
-               
-               res = m_sec->prepare(*this, parm, feparm, 1 << m_fe);
-               if (res)
-                       return res;
-#if HAVE_DVB_API_VERSION < 3
-               eDebug("tuning to %d mhz", parm.Frequency/1000);
-#else
-               eDebug("tuning to %d mhz", parm.frequency/1000);
-#endif
+               res=prepare_sat(feparm);
                break;
        }
        case feCable:
        {
-#if HAVE_DVB_API_VERSION >= 3
                eDVBFrontendParametersCable feparm;
                if (where.getDVBC(feparm))
                        return -EINVAL;
-#if HAVE_DVB_API_VERSION < 3
-               parm.Frequency = feparm.frequency * 1000;
-               parm.u.qam.SymbolRate = feparm.symbol_rate;
-#else
-               parm.frequency = feparm.frequency * 1000;
-               parm.u.qam.symbol_rate = feparm.symbol_rate;
-#endif
-               fe_modulation_t mod=QAM_AUTO;
-               switch (feparm.modulation)
-               {
-               case eDVBFrontendParametersCable::Modulation::QAM16:
-                       mod = QAM_16;
-                       break;
-               case eDVBFrontendParametersCable::Modulation::QAM32:
-                       mod = QAM_32;
-                       break;
-               case eDVBFrontendParametersCable::Modulation::QAM64:
-                       mod = QAM_64;
-                       break;
-               case eDVBFrontendParametersCable::Modulation::QAM128:
-                       mod = QAM_128;
-                       break;
-               case eDVBFrontendParametersCable::Modulation::QAM256:
-                       mod = QAM_256;
-                       break;                  
-               case eDVBFrontendParametersCable::Modulation::Auto:
-                       mod = QAM_AUTO;
-                       break;                  
-               }
-#if HAVE_DVB_API_VERSION < 3
-               parm.u.qam.QAM = mod;
-#else
-               parm.u.qam.modulation = mod;
-#endif
-               switch (feparm.inversion)
-               {               
-               case eDVBFrontendParametersCable::Inversion::On:
-                       #if HAVE_DVB_API_VERSION < 3
-                       parm.Inversion =
-                       #else
-                       parm.inversion =
-                       #endif
-                               INVERSION_ON;
-                       break;
-               case eDVBFrontendParametersCable::Inversion::Off:
-                       #if HAVE_DVB_API_VERSION < 3
-                       parm.Inversion =
-                       #else
-                       parm.inversion =
-                       #endif
-                               INVERSION_OFF;
-                       break;
-               case eDVBFrontendParametersCable::Inversion::Unknown:
-                       #if HAVE_DVB_API_VERSION < 3
-                       parm.Inversion =
-                       #else
-                       parm.inversion =
-                       #endif
-                               INVERSION_AUTO;
-                       break;
-               }
-               
-               fe_code_rate_t fec_inner=FEC_AUTO;
-               switch (feparm.fec_inner)
-               {               
-               case eDVBFrontendParametersCable::FEC::fNone:
-                       fec_inner = FEC_NONE;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f1_2:
-                       fec_inner = FEC_1_2;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f2_3:
-                       fec_inner = FEC_2_3;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f3_4:
-                       fec_inner = FEC_3_4;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f4_5:
-                       fec_inner = FEC_4_5;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f5_6:
-                       fec_inner = FEC_5_6;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f6_7:
-                       fec_inner = FEC_6_7;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f7_8:
-                       fec_inner = FEC_7_8;
-                       break;
-               case eDVBFrontendParametersCable::FEC::f8_9:
-                       fec_inner = FEC_8_9;
-                       break;
-               case eDVBFrontendParametersCable::FEC::fAuto:
-                       fec_inner = FEC_AUTO;
-                       break;
-               }
-#if HAVE_DVB_API_VERSION < 3
-               parm.u.qam.FEC_inner = fec_inner;
-#else
-               parm.u.qam.fec_inner = fec_inner;
-#endif
-#else
-               eFatal("Old API not fully supported");
-#endif // old api
+               res=prepare_cable(feparm);
+               if (!res)
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
                break;
        }
        case feTerrestrial:
@@ -877,120 +1067,28 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        eDebug("no -T data");
                        return -EINVAL;
                }
-#if HAVE_DVB_API_VERSION < 3
-               parm.Frequency = feparm.frequency;
-#else
-               parm.frequency = feparm.frequency;
-#endif
-
-               switch (feparm.bandwidth)
-               {
-               case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.bandWidth =
-#else
-                       parm.u.ofdm.bandwidth =
-#endif
-                               BANDWIDTH_8_MHZ;
-                       break;
-               case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.bandWidth =
-#else
-                       parm.u.ofdm.bandwidth =
-#endif
-                               BANDWIDTH_7_MHZ;
-                       break;
-               case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.bandWidth =
-#else
-                       parm.u.ofdm.bandwidth =
-#endif
-                               BANDWIDTH_6_MHZ;
-                       break;
-               case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.bandWidth =
-#else
-                       parm.u.ofdm.bandwidth =
-#endif
-                               BANDWIDTH_AUTO;
-                       break;
-               default:
-                       eWarning("invalid OFDM bandwith");
-                       return -EINVAL;
-               }
-               
-               parm.u.ofdm.code_rate_HP = FEC_AUTO;
-               parm.u.ofdm.code_rate_LP = FEC_AUTO;
-               
-               switch (feparm.modulation)
-               {
-               case eDVBFrontendParametersTerrestrial::Modulation::QPSK:
-                       parm.u.ofdm.constellation = QPSK;
-                       break;
-               case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
-                       parm.u.ofdm.constellation = QAM_16;
-                       break;
-               case eDVBFrontendParametersTerrestrial::Modulation::Auto:
-                       parm.u.ofdm.constellation = QAM_AUTO;
-                       break;
-               }
-               
-               switch (feparm.transmission_mode)
-               {
-               case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.TransmissionMode =
-#else
-                       parm.u.ofdm.transmission_mode =
-#endif
-                               TRANSMISSION_MODE_2K;
-                       break;
-               case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.TransmissionMode =
-#else
-                       parm.u.ofdm.transmission_mode =
-#endif
-                               TRANSMISSION_MODE_8K;
-                       break;
-               case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto:
-#if HAVE_DVB_API_VERSION < 3
-                       parm.u.ofdm.TransmissionMode =
-#else
-                       parm.u.ofdm.transmission_mode =
-#endif
-                               TRANSMISSION_MODE_AUTO;
-                       break;
-               }
-               
-               parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
-               parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO;
-#if HAVE_DVB_API_VERSION < 3
-               parm.Inversion =
-#else
-               parm.inversion =
-#endif
-                       INVERSION_AUTO;
+               res=prepare_terrestrial(feparm);
+               if (!res)
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
                break;
        }
        }
 
-       m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
-       m_tuneTimer->start(0,true);
-       m_timeout->stop();
-       m_sec_sequence.current() = m_sec_sequence.begin();
-
-       if (m_state != stateTuning)
+       if (!res)  // prepare ok
        {
-               m_tuning = 1;
-               m_state = stateTuning;
-               m_stateChanged(this);
+               m_tuneTimer->start(0,true);
+               m_timeout->stop();
+               m_sec_sequence.current() = m_sec_sequence.begin();
+
+               if (m_state != stateTuning)
+               {
+                       m_tuning = 1;
+                       m_state = stateTuning;
+                       m_stateChanged(this);
+               }
        }
 
-       return 0;
+       return res;
 }
 
 RESULT eDVBFrontend::connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)
@@ -1115,23 +1213,17 @@ RESULT eDVBFrontend::sendToneburst(int burst)
 {
 #if HAVE_DVB_API_VERSION < 3
        secMiniCmd cmd = SEC_MINI_NONE;
-       if ( burst == eDVBSatelliteDiseqcParameters::A )
-               cmd = SEC_MINI_A;
-       else if ( burst == eDVBSatelliteDiseqcParameters::B )
-               cmd = SEC_MINI_B;
-       if (::ioctl(m_secfd, SEC_DISEQC_SEND_BURST, cmd))
-               return -EINVAL;
 #else
        fe_sec_mini_cmd_t cmd = SEC_MINI_A;
+#endif
        if ( burst == eDVBSatelliteDiseqcParameters::A )
                cmd = SEC_MINI_A;
        else if ( burst == eDVBSatelliteDiseqcParameters::B )
                cmd = SEC_MINI_B;
-       else
-       {
-               eDebug("unknown toneburst!");
+#if HAVE_DVB_API_VERSION < 3
+       if (::ioctl(m_secfd, SEC_DISEQC_SEND_BURST, cmd))
                return -EINVAL;
-       }
+#else
        if (::ioctl(m_fd, FE_DISEQC_SEND_BURST, cmd))
                return -EINVAL;
 #endif