fix tune failed problems on fast zap when a diseqc swicth is in use

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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index df028c19c3a29ee41a970ebfaac51e0e715ee26c..49e2da89ffce2b8e54a1cb41324ecc6d7b24fade 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -2,6 +2,7 @@
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>
+
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
        DECLARE_REF(eDVBFrontendParameters);
@@ -14,20 +15,23 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
        int m_type;
 public:
        eDVBFrontendParameters();
-       ~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 getDVBS(eDVBFrontendParametersSatellite &) const;
+       RESULT getDVBC(eDVBFrontendParametersCable &) const;
+       RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const;
 
        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, bool exact) const;
-       
-       RESULT getHash(unsigned long &SWIG_OUTPUT) const;
+
+       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
+
+       RESULT getHash(unsigned long &) const;
+       RESULT calcLockTimeout(unsigned int &) const;
 };
 
 #ifndef SWIG
@@ -37,19 +41,44 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
+public:
+       enum {
+               NEW_CSW,
+               NEW_UCSW,
+               NEW_TONEBURST,
+               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
+       };
+       Signal1<void,iDVBFrontend*> m_stateChanged;
+private:
        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;
+       bool m_can_handle_dvbs2;
        char m_filename[128];
+       char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
        int m_secfd;
        char m_sec_filename[128];
 #endif
-
        FRONTENDPARAMETERS parm;
        int m_state;
-       Signal1<void,iDVBFrontend*> m_stateChanged;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;
        eSocketNotifier *m_sn;
        int m_tuning;
@@ -58,24 +87,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        eSecCommandList m_sec_sequence;
 
-       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];
+       long m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V
        int m_runningInputpower;
@@ -87,15 +99,16 @@ class eDVBFrontend: public iDVBFrontend, public Object
        void timeout();
        void tuneLoop();  // called by m_tuneTimer
        void setFrontend();
-       int readInputpower();
        bool setSecSequencePos(int steps);
+       static int PriorityOrder;
 public:
        eDVBFrontend(int adap, int fe, int &ok);        
        virtual ~eDVBFrontend();
 
+       int readInputpower();
        RESULT getFrontendType(int &type);
        RESULT tune(const iDVBFrontendParameters &where);
-       RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+       RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
        RESULT prepare_cable(const eDVBFrontendParametersCable &);
        RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
        RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
@@ -106,17 +119,24 @@ public:
        RESULT sendToneburst(int burst);
        RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
        RESULT setSecSequence(const eSecCommandList &list);
-       RESULT getData(int num, int &data);
-       RESULT setData(int num, int val);
+       RESULT getData(int num, long &data);
+       RESULT setData(int num, long val);
 
-       int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
-       PyObject *readTransponderData(bool original);
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, 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)
+       static void setTypePriorityOrder(int val) { PriorityOrder = val; }
+       static int getTypePriorityOrder() { return PriorityOrder; }
 
        int openFrontend();
-       int closeFrontend();
+       int closeFrontend(bool force=false);
+       const char *getDescription() const { return m_description; }
 };
 
 #endif // SWIG