revert non working changes
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Mon, 5 Jun 2006 14:57:27 +0000 (14:57 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Mon, 5 Jun 2006 14:57:27 +0000 (14:57 +0000)
lib/dvb/frontend.cpp
lib/dvb/frontend.h
lib/dvb/sec.cpp

index 220d3e8..a1bc3d9 100644 (file)
@@ -91,7 +91,6 @@ void eDVBDiseqcCommand::setCommandString(const char *str)
                eDebug("invalid diseqc command string length (string is to long)");
                return;
        }
-       eDebugNoNewLine("send diseqc:");
        unsigned char val=0;
        for (int i=0; i < slen; ++i)
        {
@@ -108,13 +107,11 @@ void eDVBDiseqcCommand::setCommandString(const char *str)
                if ( i % 2 )
                {
                        val |= c;
-                       eDebugNoNewLine("%02x", val);
                        data[i/2] = val;
                }
                else
                        val = c << 4;
        }
-       eDebug("");
        len = slen/2;
 }
 
@@ -546,9 +543,6 @@ void eDVBFrontend::feEvent(int w)
 #endif
                {
                        state = stateLock;
-                       m_data[CSW] = m_data[NEW_CSW];
-                       m_data[UCSW] = m_data[NEW_UCSW];
-                       m_data[TONEBURST] = m_data[NEW_TONEBURST];
                } else
                {
                        if (m_tuning)
index abc28d9..3670ceb 100644 (file)
@@ -58,9 +58,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
        eSecCommandList m_sec_sequence;
 
        enum {
-               NEW_CSW,              // new committed switch cmd
-               NEW_UCSW,             // new uncommitted switch cmd
-               NEW_TONEBURST,        // new toneburst switch cmd
                CSW,                  // state of the committed switch
                UCSW,                 // state of the uncommitted switch
                TONEBURST,            // current state of toneburst switch
index c679b76..7319a4b 100644 (file)
@@ -774,9 +774,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        else
                                csw = band;
 
-                       frontend.setData(eDVBFrontend::NEW_CSW, csw);
-                       frontend.setData(eDVBFrontend::NEW_UCSW, ucsw);
-                       frontend.setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
+                       frontend.setData(eDVBFrontend::CSW, csw);
+                       frontend.setData(eDVBFrontend::UCSW, ucsw);
+                       frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
 
                        if (!linked && doSetVoltageToneFrontend)
                        {