fix for avoid false locks before new frontend parameters are written to tuner

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index e82c6d4608d30280649b43bb34e4613095adfa39..6db2d0915d60eb9114789b457af67ef1fc4dd058 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -53,6 +53,16 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
+void eDVBDiseqcCommand::setCommandString(const char *str)
+{
+       if (!str)
+               return;
+       len = strlen(str);
+       if (len > MAX_DISEQC_LENGTH)
+               len = MAX_DISEQC_LENGTH;
+       memcpy(data, str, len);
+}
+
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
 {
        frequency    = descriptor.getFrequency() * 10;
@@ -361,7 +371,6 @@ int eDVBFrontend::openFrontend()
 
        m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
        CONNECT(m_sn->activated, eDVBFrontend::feEvent);
-       m_sn->start();
 
        return 0;
 }
@@ -607,7 +616,7 @@ void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
        case FEC_7_8:
                tmp = "FEC_7_8";
                break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
        case FEC_8_9:
                tmp = "FEC_8_9";
                break;
@@ -1165,6 +1174,8 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 void eDVBFrontend::setFrontend()
 {
        eDebug("setting frontend %d", m_fe);
+       m_sn->start();
+       feEvent(-1);
        if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
        {
                perror("FE_SET_FRONTEND failed");
@@ -1229,6 +1240,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
                                parm_u_qpsk_fec_inner = FEC_7_8;
                                break;
                }
+               // 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);
+                       return -EINVAL;
+               }
                eDebug("tuning to %d mhz", parm_frequency/1000);
        }
        return res;
@@ -1293,7 +1310,7 @@ RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
        case eDVBFrontendParametersCable::FEC::f7_8:
                parm_u_qam_fec_inner = FEC_7_8;
                break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
        case eDVBFrontendParametersCable::FEC::f8_9:
                parm_u_qam_fec_inner = FEC_8_9;
                break;
@@ -1438,13 +1455,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
        eDebug("(%d)tune", m_fe);
 
+       m_timeout->stop();
+
        int res=0;
 
        if (m_type == -1)
                return -ENODEV;
 
-       feEvent(-1);
-
+       m_sn->stop();
        m_sec_sequence.clear();
 
        switch (m_type)
@@ -1467,7 +1485,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        return -EINVAL;
                res=prepare_cable(feparm);
                if (!res)
+               {
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               }
                break;
        }
        case feTerrestrial:
@@ -1480,7 +1501,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                }
                res=prepare_terrestrial(feparm);
                if (!res)
+               {
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               }
                break;
        }
        }
@@ -1488,7 +1512,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
        if (!res)  // prepare ok
        {
                m_tuneTimer->start(0,true);
-               m_timeout->stop();
                m_sec_sequence.current() = m_sec_sequence.begin();
 
                if (m_state != stateTuning)