remove bouquets.tv and userbouquets... from Makefile (it is installed

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 93d9cf241645fc2ae5d92584a5ed35090c8a0c82..2241e00ecfc7e04fd0adb4827488d470290c8fb9 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -1,7 +1,6 @@
 #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>
 


@@ -13,11 +12,17 @@ public:
        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,

-               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,
+               IF_TUNER_LOCKED_GOTO,
+               IF_TONE_GOTO, IF_NOT_TONE_GOTO,
+               START_TUNE_TIMEOUT

        };
        int cmd;
        struct rotor
        };
        int cmd;
        struct rotor


@@ -29,7 +34,12 @@ public:
        };
        struct pair
        {
        };
        struct pair
        {

-               int voltage;
+               union
+               {
+                       int voltage;
+                       int tone;
+                       int val;
+               };

                int steps;
        };
        union
                int steps;
        };
        union


@@ -68,8 +78,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())


@@ -88,15 +102,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();
        }


@@ -109,17 +123,21 @@ 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

-       __u8 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;
 
        __u8 m_repeats; // for cascaded switches
        t_toneburst_param m_toneburst_param;
 
        __u8 m_repeats; // for cascaded switches


@@ -135,29 +153,42 @@ public:
                        4) uncommitted, committed, toneburst
                        5) toneburst, uncommitted, committed */
        __u8 m_uncommitted_cmd; // state of the 4 uncommitted switches..
                        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;
        __u8 m_rotorPosNum; // 0 is disable.. then use gotoxx
        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 };

-
+       enum { FAST, SLOW };
+#ifndef SWIG

        eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
        struct eDVBSatelliteRotorInputpowerParameters
        {
                bool m_use;     // can we use rotor inputpower to detect rotor running state ?
                __u8 m_delta;   // delta between running and stopped rotor
        eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
        struct eDVBSatelliteRotorInputpowerParameters
        {
                bool m_use;     // can we use rotor inputpower to detect rotor running state ?
                __u8 m_delta;   // delta between running and stopped rotor

+               unsigned int m_turning_speed; // SLOW, FAST, or fast turning epoch

        };
        eDVBSatelliteRotorInputpowerParameters m_inputpower_parameters;
 
        };
        eDVBSatelliteRotorInputpowerParameters m_inputpower_parameters;
 


@@ -172,6 +203,7 @@ public:
 
        void setDefaultOptions() // set default rotor options
        {
 
        void setDefaultOptions() // set default rotor options
        {

+               m_inputpower_parameters.m_turning_speed = FAST; // fast turning

                m_inputpower_parameters.m_use = true;
                m_inputpower_parameters.m_delta = 60;
                m_gotoxx_parameters.m_lo_direction = EAST;
                m_inputpower_parameters.m_use = true;
                m_inputpower_parameters.m_delta = 60;
                m_gotoxx_parameters.m_lo_direction = EAST;


@@ -179,15 +211,21 @@ public:
                m_gotoxx_parameters.m_longitude = 0.0;
                m_gotoxx_parameters.m_latitude = 0.0;
        }
                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...)
+       __u8 slot_mask; // useable by slot ( 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)
 
        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)


@@ -198,33 +236,61 @@ public:
        std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
        eDVBSatelliteDiseqcParameters m_diseqc_parameters;
        eDVBSatelliteRotorParameters m_rotor_parameters;
        std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
        eDVBSatelliteDiseqcParameters m_diseqc_parameters;
        eDVBSatelliteRotorParameters m_rotor_parameters;

-};

 #endif
 #endif

+};

 
 class eDVBRegisteredFrontend;
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {
 
 class eDVBRegisteredFrontend;
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {

+public:
+       enum {
+               DELAY_AFTER_CONT_TONE=0,  // delay after continuous tone change
+               DELAY_AFTER_FINAL_VOLTAGE_CHANGE, // delay after voltage change at end of complete sequence
+               DELAY_BETWEEN_DISEQC_REPEATS, // delay between repeated diseqc commands
+               DELAY_AFTER_LAST_DISEQC_CMD, // delay after last diseqc command
+               DELAY_AFTER_TONEBURST, // delay after toneburst
+               DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, // delay after enable voltage before transmit toneburst/diseqc
+               DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, // delay after transmit toneburst / diseqc and before transmit motor command
+               DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, // delay after voltage change before measure idle input power
+               DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, // delay after enable voltage before transmit motor command
+               DELAY_AFTER_MOTOR_STOP_CMD, // delay after transmit motor stop
+               DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, // delay after voltage change before transmit motor command
+               MOTOR_COMMAND_RETRIES, // max transmit tries of rotor command when the rotor dont start turning (with power measurement)
+               MOTOR_RUNNING_TIMEOUT, // max motor running time before timeout
+               DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, // delay after change voltage before transmit toneburst/diseqc
+               MAX_PARAMS
+       };
+private:

 #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;
 #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;
+       int m_not_linked_slot_mask;
+       bool m_canMeasureInputPower;
+#endif
+#ifdef SWIG
+       eDVBSatelliteEquipmentControl();
+       ~eDVBSatelliteEquipmentControl();

 #endif
 #endif

+       static int m_params[MAX_PARAMS];

 public:
 public:

-       eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);

 #ifndef SWIG
 #ifndef SWIG

+       eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);

        DECLARE_REF(eDVBSatelliteEquipmentControl);
        DECLARE_REF(eDVBSatelliteEquipmentControl);

-       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id);
+       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int tunetimeout);

        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; }
        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; }

+       static void setParam(int param, int value);

        RESULT clear();
 /* LNB Specific Parameters */
        RESULT addLNB();
        RESULT clear();
 /* LNB Specific Parameters */
        RESULT addLNB();

-       RESULT setLNBTunerMask(int tunermask);
+       RESULT setLNBSlotMask(int slotmask);

        RESULT setLNBLOFL(int lofl);
        RESULT setLNBLOFH(int lofh);
        RESULT setLNBThreshold(int threshold);
        RESULT setLNBLOFL(int lofl);
        RESULT setLNBLOFH(int lofh);
        RESULT setLNBThreshold(int threshold);


@@ -245,6 +311,7 @@ public:
        RESULT setLaDirection(int direction);
        RESULT setUseInputpower(bool onoff);
        RESULT setInputpowerDelta(int delta);  // delta between running and stopped rotor
        RESULT setLaDirection(int direction);
        RESULT setUseInputpower(bool onoff);
        RESULT setInputpowerDelta(int delta);  // delta between running and stopped rotor

+       RESULT setRotorTurningSpeed(int speed);  // set turning speed..

 /* Satellite Specific Parameters */
        RESULT addSatellite(int orbital_position);
        RESULT setVoltageMode(int mode);
 /* Satellite Specific Parameters */
        RESULT addSatellite(int orbital_position);
        RESULT setVoltageMode(int mode);


@@ -252,8 +319,13 @@ public:
        RESULT setRotorPosNum(int rotor_pos_num);
 /* Tuner Specific Parameters */
        RESULT setTunerLinked(int from, int to);
        RESULT setRotorPosNum(int rotor_pos_num);
 /* Tuner Specific Parameters */
        RESULT setTunerLinked(int from, int to);

-       
+       RESULT setTunerDepends(int from, int to);
+       void setSlotNotLinked(int tuner_no);
+
+       PyObject *get_exclusive_satellites(int tu1, int tu2);
+       void setRotorMoving(bool); // called from the frontend's

        bool isRotorMoving();
        bool isRotorMoving();

+       bool canMeasureInputPower() { return m_canMeasureInputPower; }

 };
 
 #endif
 };
 
 #endif