now link dvb-s frontends to dvb-s2 frontends is possible

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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index ac681bbe06ef8bc1c8edacf1b153f17329bce7dc..111e715dbe10b61ee06924b9d72823641c6743ce 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -41,6 +41,25 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {

+public:
+       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
+       };
+       Signal1<void,iDVBFrontend*> m_stateChanged;
+private:

        DECLARE_REF(eDVBFrontend);
        bool m_enabled;
        int m_type;
        DECLARE_REF(eDVBFrontend);
        bool m_enabled;
        int m_type;


@@ -48,16 +67,15 @@ class eDVBFrontend: public iDVBFrontend, public Object
        int m_slotid;
        int m_fd;
        bool m_need_rotor_workaround;
        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
        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;
        FRONTENDPARAMETERS parm;
        int m_state;

-       Signal1<void,iDVBFrontend*> m_stateChanged;

        ePtr<iDVBSatelliteEquipmentControl> m_sec;
        eSocketNotifier *m_sn;
        int m_tuning;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;
        eSocketNotifier *m_sn;
        int m_tuning;


@@ -66,23 +84,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        eSecCommandList m_sec_sequence;
 
 
        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
-       };
-

        long m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V
        long m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V


@@ -95,7 +96,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
        void timeout();
        void tuneLoop();  // called by m_tuneTimer
        void setFrontend();
        void timeout();
        void tuneLoop();  // called by m_tuneTimer
        void setFrontend();

-       int readInputpower();

        bool setSecSequencePos(int steps);
        void setRotorData(int pos, int cmd);
        static int PriorityOrder;
        bool setSecSequencePos(int steps);
        void setRotorData(int pos, int cmd);
        static int PriorityOrder;


@@ -103,6 +103,7 @@ public:
        eDVBFrontend(int adap, int fe, int &ok);        
        virtual ~eDVBFrontend();
 
        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 &, unsigned int timeout);
        RESULT getFrontendType(int &type);
        RESULT tune(const iDVBFrontendParameters &where);
        RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);


@@ -132,7 +133,7 @@ public:
        static int getTypePriorityOrder() { return PriorityOrder; }
 
        int openFrontend();
        static int getTypePriorityOrder() { return PriorityOrder; }
 
        int openFrontend();

-       int closeFrontend();
+       int closeFrontend(bool force=false);

        const char *getDescription() const { return m_description; }
 };
 
        const char *getDescription() const { return m_description; }
 };