fix error handling

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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 1889b971492b8955b20c53596d114157c4842b99..6bf36466752deb42bf82df94c46980dd4d908d49 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -14,17 +14,18 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
        int m_type;
 public:
        eDVBFrontendParameters();
+       ~eDVBFrontendParameters() {}
        
        RESULT getSystem(int &type) const;
        RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
        RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
        RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
 
-       RESULT setDVBS(const eDVBFrontendParametersSatellite &p);
+       RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);
        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
        
-       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
+       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const;
        
        RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };
@@ -37,10 +38,14 @@ class eSecCommandList;
 class eDVBFrontend: public iDVBFrontend, public Object
 {
        DECLARE_REF(eDVBFrontend);
+       bool m_enabled;
        int m_type;
-       int m_fe;
+       int m_dvbid;
+       int m_slotid;
        int m_fd;
+       bool m_need_rotor_workaround;
        char m_filename[128];
+       char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
        int m_secfd;
        char m_sec_filename[128];
@@ -57,24 +62,30 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        eSecCommandList m_sec_sequence;
 
-       int m_data[10]; /* when satellite frontend then
-               data[0] = lastcsw -> state of the committed switch
-               data[1] = lastucsw -> state of the uncommitted switch
-               data[2] = lastToneburst -> current state of toneburst switch
-               data[3] = newRotorCmd -> last sent rotor cmd
-               data[4] = newRotorPos -> current Rotor Position
-               data[5] = curRotorCmd
-               data[6] = curRotorPos
-               data[7] = linkedToTunerNo
-               data[8] = dependsToTunerNo (just satpos.. for rotor with twin lnb)
-               data[9] = previousFrequencyOffset */
+       enum {
+               CSW,                  // state of the committed switch
+               UCSW,                 // state of the uncommitted switch
+               TONEBURST,            // current state of toneburst switch
+               NEW_ROTOR_CMD,        // prev sent rotor cmd
+               NEW_ROTOR_POS,        // new rotor position (not validated)
+               ROTOR_CMD,            // completed rotor cmd (finalized)
+               ROTOR_POS,            // current rotor position
+               LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
+               LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
+               SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
+               FREQ_OFFSET,          // current frequency offset
+               CUR_VOLTAGE,          // current voltage
+               CUR_TONE,             // current continuous tone
+               NUM_DATA_ENTRIES
+       };
+
+       int m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V
        int m_runningInputpower;
 
        int m_timeoutCount; // needed for timeout
        int m_retryCount; // diseqc retry for rotor
-       int m_curVoltage;
 
        void feEvent(int);
        void timeout();
@@ -82,6 +93,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
        void setFrontend();
        int readInputpower();
        bool setSecSequencePos(int steps);
+       void setRotorData(int pos, int cmd);
 public:
        eDVBFrontend(int adap, int fe, int &ok);        
        virtual ~eDVBFrontend();
@@ -102,11 +114,15 @@ public:
        RESULT getData(int num, int &data);
        RESULT setData(int num, int val);
 
-       int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
-       PyObject *readTransponderData(bool original);
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalPowerdB, signalQuality, locked, synced
+       void getFrontendStatus(ePyObject dest);
+       void getTransponderData(ePyObject dest, bool original);
+       void getFrontendData(ePyObject dest);
 
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
-       int getID() { return m_fe; }
+       int getDVBID() { return m_dvbid; }
+       int getSlotID() { return m_slotid; }
+       bool setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
 
        int openFrontend();
        int closeFrontend();