rotor fix

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 71fff6a5d2e16380e918b3c239718e77fd902df6..ac18f3c66116d7cd8ce04456389a29778725f836 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -1,21 +1,39 @@
 #ifndef __dvb_sec_h
 #define __dvb_sec_h
 
 #ifndef __dvb_sec_h
 #define __dvb_sec_h
 

-#include <config.h>

 #include <lib/dvb/idvb.h>
 #include <list>
 
 #include <lib/dvb/idvb.h>
 #include <list>
 

+#ifndef SWIG

 class eSecCommand
 {
 public:
 class eSecCommand
 {
 public:

+       enum { modeStatic, modeDynamic };

        enum {
                NONE, SLEEP, SET_VOLTAGE, SET_TONE, GOTO,
                SEND_DISEQC, SEND_TONEBURST, SET_FRONTEND,
        enum {
                NONE, SLEEP, SET_VOLTAGE, SET_TONE, GOTO,
                SEND_DISEQC, SEND_TONEBURST, SET_FRONTEND,

+               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,
                MEASURE_IDLE_INPUTPOWER, MEASURE_RUNNING_INPUTPOWER,

-               IF_TIMEOUT_GOTO, IF_RUNNING_GOTO, IF_STOPPED_GOTO,
-               UPDATE_CURRENT_ROTORPARAMS, SET_TIMEOUT, 
+               IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, IF_INPUTPOWER_DELTA_GOTO,
+               UPDATE_CURRENT_ROTORPARAMS, INVALIDATE_CURRENT_ROTORPARMS,
+               IF_ROTORPOS_VALID_GOTO

        };
        int cmd;
        };
        int cmd;

+       struct rotor
+       {
+               int deltaA;   // difference in mA between running and stopped rotor
+               int okcount;  // counter
+               int steps;    // goto steps
+               int direction;
+       };
+       struct pair
+       {
+               int voltage;
+               int steps;
+       };

        union
        {
                int val;
        union
        {
                int val;


@@ -25,7 +43,10 @@ public:
                int tone;
                int toneburst;
                int msec;
                int tone;
                int toneburst;
                int msec;

+               int mode;
+               rotor measure;

                eDVBDiseqcCommand diseqc;
                eDVBDiseqcCommand diseqc;

+               pair compare;

        };
        eSecCommand( int cmd )
                :cmd(cmd)
        };
        eSecCommand( int cmd )
                :cmd(cmd)


@@ -36,6 +57,12 @@ public:
        eSecCommand( int cmd, eDVBDiseqcCommand diseqc )
                :cmd(cmd), diseqc(diseqc)
        {}
        eSecCommand( int cmd, eDVBDiseqcCommand diseqc )
                :cmd(cmd), diseqc(diseqc)
        {}

+       eSecCommand( int cmd, rotor measure )
+               :cmd(cmd), measure(measure)
+       {}
+       eSecCommand( int cmd, pair compare )
+               :cmd(cmd), compare(compare)
+       {}

        eSecCommand()
                :cmd(NONE)
        {}
        eSecCommand()
                :cmd(NONE)
        {}


@@ -43,8 +70,12 @@ public:
 
 class eSecCommandList
 {
 
 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())
 public:
        eSecCommandList()
                :cur(secSequence.end())


@@ -63,15 +94,15 @@ public:
                secSequence.clear();
                cur=secSequence.end();
        }
                secSequence.clear();
                cur=secSequence.end();
        }

-       inline std::list<eSecCommand>::iterator &current()
+       inline iterator &current()

        {
                return cur;
        }
        {
                return cur;
        }

-       inline std::list<eSecCommand>::iterator begin()
+       inline iterator begin()

        {
                return secSequence.begin();
        }
        {
                return secSequence.begin();
        }

-       inline std::list<eSecCommand>::iterator end()
+       inline iterator end()

        {
                return secSequence.end();
        }
        {
                return secSequence.end();
        }


@@ -84,100 +115,181 @@ public:
                return secSequence.size();
        }
 };
                return secSequence.size();
        }
 };

+#endif

 
 class eDVBSatelliteDiseqcParameters
 {
 
 class eDVBSatelliteDiseqcParameters
 {

+#ifdef SWIG
+       eDVBSatelliteDiseqcParameters();
+       ~eDVBSatelliteDiseqcParameters();
+#endif

 public:
        enum { AA=0, AB=1, BA=2, BB=3, SENDNO=4 /* and 0xF0 .. 0xFF*/  };       // DiSEqC Parameter
 public:
        enum { AA=0, AB=1, BA=2, BB=3, SENDNO=4 /* and 0xF0 .. 0xFF*/  };       // DiSEqC Parameter

-       int m_committed_cmd;
-

        enum t_diseqc_mode { NONE=0, V1_0=1, V1_1=2, V1_2=3, SMATV=4 }; // DiSEqC Mode
        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 };
        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;
 
        t_toneburst_param m_toneburst_param;
 

-       int m_repeats;  // for cascaded switches
+       __u8 m_repeats; // for cascaded switches

        bool m_use_fast;        // send no DiSEqC on H/V or Lo/Hi change
        bool m_seq_repeat;      // send the complete DiSEqC Sequence twice...
        bool m_use_fast;        // send no DiSEqC on H/V or Lo/Hi change
        bool m_seq_repeat;      // send the complete DiSEqC Sequence twice...

-       bool m_swap_cmds;       // swaps the committed & uncommitted cmd
-       int m_uncommitted_cmd;  // state of the 4 uncommitted switches..
+       __u8 m_command_order;
+       /*      diseqc 1.0)
+                       0) commited, toneburst
+                       1) toneburst, committed
+               diseqc > 1.0)
+                       2) committed, uncommitted, toneburst
+                       3) toneburst, committed, uncommitted
+                       4) uncommitted, committed, toneburst
+                       5) toneburst, uncommitted, committed */
+       __u8 m_uncommitted_cmd; // state of the 4 uncommitted switches..
+#endif

 };
 
 class eDVBSatelliteSwitchParameters
 {
 };
 
 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
 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;
        t_voltage_mode m_voltage_mode;
        t_22khz_signal m_22khz_signal;

+       __u8 m_rotorPosNum; // 0 is disable.. then use gotoxx
+#endif

 };
 
 class eDVBSatelliteRotorParameters
 {
 };
 
 class eDVBSatelliteRotorParameters
 {

+#ifdef SWIG
+       eDVBSatelliteRotorParameters();
+       ~eDVBSatelliteRotorParameters();
+#endif

 public:
        enum { NORTH, SOUTH, EAST, WEST };
 public:
        enum { NORTH, SOUTH, EAST, WEST };

+#ifndef SWIG
+       eDVBSatelliteRotorParameters() { setDefaultOptions(); }

 
        struct eDVBSatelliteRotorInputpowerParameters
        {
                bool m_use;     // can we use rotor inputpower to detect rotor running state ?
 
        struct eDVBSatelliteRotorInputpowerParameters
        {
                bool m_use;     // can we use rotor inputpower to detect rotor running state ?

-               int m_threshold;        // threshold between running and stopped rotor
+               __u8 m_delta;   // delta between running and stopped rotor

        };
        eDVBSatelliteRotorInputpowerParameters m_inputpower_parameters;
 
        struct eDVBSatelliteRotorGotoxxParameters
        {
        };
        eDVBSatelliteRotorInputpowerParameters m_inputpower_parameters;
 
        struct eDVBSatelliteRotorGotoxxParameters
        {

-               bool m_can_use; // rotor support gotoXX cmd ?
-               int m_lo_direction;     // EAST, WEST
-               int m_la_direction;     // NORT, SOUTH
-               double m_longitude;     // longitude for gotoXX° function
-               double m_latitude;      // latitude for gotoXX° function
+               __u8 m_lo_direction;    // EAST, WEST
+               __u8 m_la_direction;    // NORT, SOUTH
+               double m_longitude;     // longitude for gotoXX? function
+               double m_latitude;      // latitude for gotoXX? function

        };
        eDVBSatelliteRotorGotoxxParameters m_gotoxx_parameters;
 
        };
        eDVBSatelliteRotorGotoxxParameters m_gotoxx_parameters;
 

-       struct Orbital_Position_Compare
+       void setDefaultOptions() // set default rotor options

        {
        {

-               inline bool operator()(const int &i1, const int &i2) const
-               {
-                       return abs(i1-i2) < 6 ? false: i1 < i2;
-               }
-       };
-       std::map< int, int, Orbital_Position_Compare > m_rotor_position_table;
-       /* mapping orbitalposition <-> number stored in rotor */
-
-       void setDefaultOptions(); // set default rotor options
-};
-
-class eDVBSatelliteParameters
-{
-public:
-       eDVBSatelliteDiseqcParameters m_diseqc_parameters;
-       eDVBSatelliteRotorParameters m_rotor_parameters;
-       eDVBSatelliteSwitchParameters m_switch_parameters;
+               m_inputpower_parameters.m_use = true;
+               m_inputpower_parameters.m_delta = 60;
+               m_gotoxx_parameters.m_lo_direction = EAST;
+               m_gotoxx_parameters.m_la_direction = NORTH;
+               m_gotoxx_parameters.m_longitude = 0.0;
+               m_gotoxx_parameters.m_latitude = 0.0;
+       }
+#endif

 };
 
 class eDVBSatelliteLNBParameters
 {
 };
 
 class eDVBSatelliteLNBParameters
 {

+#ifdef SWIG
+       eDVBSatelliteLNBParameters();
+       ~eDVBSatelliteLNBParameters();
+#endif

 public:
        enum t_12V_relais_state { OFF=0, ON };
 public:
        enum t_12V_relais_state { OFF=0, ON };

+#ifndef SWIG

        t_12V_relais_state m_12V_relais_state;  // 12V relais output on/off
 
        t_12V_relais_state m_12V_relais_state;  // 12V relais output on/off
 

+       __u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...)
+

        unsigned int m_lof_hi,  // for 2 band universal lnb 10600 Mhz (high band offset frequency)
                                m_lof_lo,       // for 2 band universal lnb  9750 Mhz (low band offset frequency)
                                m_lof_threshold;        // for 2 band universal lnb 11750 Mhz (band switch frequency)
 
        bool m_increased_voltage; // use increased voltage ( 14/18V )
 
        unsigned int m_lof_hi,  // for 2 band universal lnb 10600 Mhz (high band offset frequency)
                                m_lof_lo,       // for 2 band universal lnb  9750 Mhz (low band offset frequency)
                                m_lof_threshold;        // for 2 band universal lnb 11750 Mhz (band switch frequency)
 
        bool m_increased_voltage; // use increased voltage ( 14/18V )
 

-       std::map<int, eDVBSatelliteParameters> m_satellites;
+       std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
+       eDVBSatelliteDiseqcParameters m_diseqc_parameters;
+       eDVBSatelliteRotorParameters m_rotor_parameters;
+#endif

 };
 
 };
 

+class eDVBRegisteredFrontend;
+

 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {

-       std::list<eDVBSatelliteLNBParameters> m_lnblist;
+#ifndef SWIG
+       static eDVBSatelliteEquipmentControl *instance;
+       eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough
+       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:
 public:

+#ifndef SWIG
+       eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);

        DECLARE_REF(eDVBSatelliteEquipmentControl);
        DECLARE_REF(eDVBSatelliteEquipmentControl);

-       eDVBSatelliteEquipmentControl();
-       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat);
+       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id);
+       int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
+       bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
+#endif
+       static eDVBSatelliteEquipmentControl *getInstance() { return instance; }
+       RESULT clear();
+/* LNB Specific Parameters */
+       RESULT addLNB();
+       RESULT setLNBTunerMask(int tunermask);
+       RESULT setLNBLOFL(int lofl);
+       RESULT setLNBLOFH(int lofh);
+       RESULT setLNBThreshold(int threshold);
+       RESULT setLNBIncreasedVoltage(bool onoff);
+/* DiSEqC Specific Parameters */
+       RESULT setDiSEqCMode(int diseqcmode);
+       RESULT setToneburst(int toneburst);
+       RESULT setRepeats(int repeats);
+       RESULT setCommittedCommand(int command);
+       RESULT setUncommittedCommand(int command);
+       RESULT setCommandOrder(int order);
+       RESULT setFastDiSEqC(bool onoff);
+       RESULT setSeqRepeat(bool onoff); // send the complete switch sequence twice (without rotor command)
+/* Rotor Specific Parameters */
+       RESULT setLongitude(float longitude);
+       RESULT setLatitude(float latitude);
+       RESULT setLoDirection(int direction);
+       RESULT setLaDirection(int direction);
+       RESULT setUseInputpower(bool onoff);
+       RESULT setInputpowerDelta(int delta);  // delta between running and stopped rotor
+/* Satellite Specific Parameters */
+       RESULT addSatellite(int orbital_position);
+       RESULT setVoltageMode(int mode);
+       RESULT setToneMode(int mode);
+       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();

 };
 
 #endif
 };
 
 #endif