changes for identify -C and -T services

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index cb853e2bf83809c377783bd419f2ee3bb4a1699d..51d21105da4fd62e4e4be9d0aa5ee4bb84dacc6a 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -57,10 +57,40 @@ 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);
+       len=0;
+       int slen = strlen(str);
+       if (slen % 2)
+       {
+               eDebug("invalid diseqc command string length (not 2 byte aligned)");
+               return;
+       }
+       if (slen > MAX_DISEQC_LENGTH*2)
+       {
+               eDebug("invalid diseqc command string length (string is to long)");
+               return;
+       }
+       unsigned char val=0;
+       for (int i=0; i < slen; ++i)
+       {
+               unsigned char c = str[i];
+               switch(c)
+               {
+                       case '0' ... '9': c-=48; break;
+                       case 'a' ... 'f': c-=87; break;
+                       case 'A' ... 'F': c-=55; break;
+                       default:
+                               eDebug("invalid character in hex string..ignore complete diseqc command !");
+                               return;
+               }
+               if ( i % 2 )
+               {
+                       val |= c;
+                       data[i/2] = val;
+               }
+               else
+                       val = c << 4;
+       }
+       len = slen/2;
 }
 
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
@@ -262,7 +292,11 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
                return 0;
        }
        case iDVBFrontend::feCable:
+               hash = 0xFFFF0000;
+               return 0;
        case iDVBFrontend::feTerrestrial:
+               hash = 0xEEEE0000;
+               return 0;
        default:
                return -1;
        }
@@ -392,8 +426,11 @@ int eDVBFrontend::closeFrontend()
        if (m_fd >= 0)
        {
                eDebug("close frontend %d", m_fe);
+               m_tuneTimer->stop();
                setTone(iDVBFrontend::toneOff);
                setVoltage(iDVBFrontend::voltageOff);
+               if (m_sec)
+                       m_sec->setRotorMoving(false);
                ::close(m_fd);
                m_fd=-1;
                m_data[0] = m_data[1] = m_data[2] = -1;
@@ -770,6 +807,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
        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;
@@ -1435,6 +1475,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
        }
        switch (feparm.hierarchy)
        {
+               case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+                       parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
+                       break;
                case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
                        parm_u_ofdm_hierarchy_information = HIERARCHY_1;
                        break;
@@ -1449,6 +1492,19 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
                        parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
                        break;
        }
+       switch (feparm.inversion)
+       {
+       case eDVBFrontendParametersTerrestrial::Inversion::On:
+               parm_inversion = INVERSION_ON;
+               break;
+       case eDVBFrontendParametersTerrestrial::Inversion::Off:
+               parm_inversion = INVERSION_OFF;
+               break;
+       default:
+       case eDVBFrontendParametersTerrestrial::Inversion::Unknown:
+               parm_inversion = INVERSION_AUTO;
+               break;
+       }
        return 0;
 }
 
@@ -1477,6 +1533,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        return -EINVAL;
                }
                res=prepare_sat(feparm);
+               m_sec->setRotorMoving(false);
                break;
        }
        case feCable: