rotor fix

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 93d9cf241645fc2ae5d92584a5ed35090c8a0c82..ac18f3c66116d7cd8ce04456389a29778725f836 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_sec_h
 #define __dvb_sec_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
 #include <list>
 
@@ -13,11 +12,14 @@ public:
        enum {
                NONE, SLEEP, SET_VOLTAGE, SET_TONE, GOTO,
                SEND_DISEQC, SEND_TONEBURST, SET_FRONTEND,
-               MEASURE_IDLE_INPUTPOWER, MEASURE_RUNNING_INPUTPOWER,
-               IF_TIMEOUT_GOTO, IF_INPUTPOWER_DELTA_GOTO,
-               UPDATE_CURRENT_ROTORPARAMS, SET_TIMEOUT,
-               IF_IDLE_INPUTPOWER_AVAIL_GOTO, SET_POWER_LIMITING_MODE,
-               IF_VOLTAGE_GOTO
+               SET_TIMEOUT, IF_TIMEOUT_GOTO, 
+               IF_VOLTAGE_GOTO, IF_NOT_VOLTAGE_GOTO,
+               SET_POWER_LIMITING_MODE,
+               SET_ROTOR_DISEQC_RETRYS, IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO,
+               MEASURE_IDLE_INPUTPOWER, MEASURE_RUNNING_INPUTPOWER,
+               IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, IF_INPUTPOWER_DELTA_GOTO,
+               UPDATE_CURRENT_ROTORPARAMS, INVALIDATE_CURRENT_ROTORPARMS,
+               IF_ROTORPOS_VALID_GOTO
        };
        int cmd;
        struct rotor
@@ -68,8 +70,12 @@ public:
 
 class eSecCommandList
 {
-       std::list<eSecCommand> secSequence;
-       std::list<eSecCommand>::iterator cur;
+       typedef std::list<eSecCommand> List;
+       List secSequence;
+public:
+       typedef List::iterator iterator;
+private:
+       iterator cur;
 public:
        eSecCommandList()
                :cur(secSequence.end())
@@ -88,15 +94,15 @@ public:
                secSequence.clear();
                cur=secSequence.end();
        }
-       inline std::list<eSecCommand>::iterator &current()
+       inline iterator &current()
        {
                return cur;
        }
-       inline std::list<eSecCommand>::iterator begin()
+       inline iterator begin()
        {
                return secSequence.begin();
        }
-       inline std::list<eSecCommand>::iterator end()
+       inline iterator end()
        {
                return secSequence.end();
        }
@@ -109,17 +115,21 @@ public:
                return secSequence.size();
        }
 };
+#endif
 
 class eDVBSatelliteDiseqcParameters
 {
+#ifdef SWIG
+       eDVBSatelliteDiseqcParameters();
+       ~eDVBSatelliteDiseqcParameters();
+#endif
 public:
        enum { AA=0, AB=1, BA=2, BB=3, SENDNO=4 /* and 0xF0 .. 0xFF*/  };       // DiSEqC Parameter
-       __u8 m_committed_cmd;
-
        enum t_diseqc_mode { NONE=0, V1_0=1, V1_1=2, V1_2=3, SMATV=4 }; // DiSEqC Mode
-       t_diseqc_mode m_diseqc_mode;
-
        enum t_toneburst_param { NO=0, A=1, B=2 };
+#ifndef SWIG
+       __u8 m_committed_cmd;
+       t_diseqc_mode m_diseqc_mode;
        t_toneburst_param m_toneburst_param;
 
        __u8 m_repeats; // for cascaded switches
@@ -135,23 +145,34 @@ public:
                        4) uncommitted, committed, toneburst
                        5) toneburst, uncommitted, committed */
        __u8 m_uncommitted_cmd; // state of the 4 uncommitted switches..
+#endif
 };
 
 class eDVBSatelliteSwitchParameters
 {
+#ifdef SWIG
+       eDVBSatelliteSwitchParameters();
+       ~eDVBSatelliteSwitchParameters();
+#endif
 public:
        enum t_22khz_signal {   HILO=0, ON=1, OFF=2     }; // 22 Khz
        enum t_voltage_mode     {       HV=0, _14V=1, _18V=2, _0V=3 }; // 14/18 V
+#ifndef SWIG
        t_voltage_mode m_voltage_mode;
        t_22khz_signal m_22khz_signal;
        __u8 m_rotorPosNum; // 0 is disable.. then use gotoxx
+#endif
 };
 
 class eDVBSatelliteRotorParameters
 {
+#ifdef SWIG
+       eDVBSatelliteRotorParameters();
+       ~eDVBSatelliteRotorParameters();
+#endif
 public:
        enum { NORTH, SOUTH, EAST, WEST };
-
+#ifndef SWIG
        eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
        struct eDVBSatelliteRotorInputpowerParameters
@@ -179,12 +200,18 @@ public:
                m_gotoxx_parameters.m_longitude = 0.0;
                m_gotoxx_parameters.m_latitude = 0.0;
        }
+#endif
 };
 
 class eDVBSatelliteLNBParameters
 {
+#ifdef SWIG
+       eDVBSatelliteLNBParameters();
+       ~eDVBSatelliteLNBParameters();
+#endif
 public:
        enum t_12V_relais_state { OFF=0, ON };
+#ifndef SWIG
        t_12V_relais_state m_12V_relais_state;  // 12V relais output on/off
 
        __u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...)
@@ -198,8 +225,8 @@ public:
        std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
        eDVBSatelliteDiseqcParameters m_diseqc_parameters;
        eDVBSatelliteRotorParameters m_rotor_parameters;
-};
 #endif
+};
 
 class eDVBRegisteredFrontend;
 
@@ -211,10 +238,17 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
        int m_lnbidx; // current index for set parameters
        std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
        eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends;
+       bool m_rotorMoving;
+#endif
+#ifdef SWIG
+       eDVBSatelliteEquipmentControl();
+       ~eDVBSatelliteEquipmentControl();
 #endif
+       // helper function for setTunerLinked and setTunerDepends
+       RESULT setDependencyPointers( int no1, int no2, int dest_data_byte );
 public:
-       eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
 #ifndef SWIG
+       eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
        DECLARE_REF(eDVBSatelliteEquipmentControl);
        RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id);
        int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
@@ -252,7 +286,9 @@ public:
        RESULT setRotorPosNum(int rotor_pos_num);
 /* Tuner Specific Parameters */
        RESULT setTunerLinked(int from, int to);
-       
+       RESULT setTunerDepends(int from, int to);
+
+       void setRotorMoving(bool); // called from the frontend's
        bool isRotorMoving();
 };