Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index e68ed167dc1c9488a38e0548188af222b9824128..c50aee4d381c28dcb9712cb064efda508790e97b 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -170,7 +170,7 @@ class 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
+       enum t_voltage_mode     {       HV=0, _14V=1, _18V=2, _0V=3, HV_13=4 }; // 14/18 V
 #ifndef SWIG
        t_voltage_mode m_voltage_mode;
        t_22khz_signal m_22khz_signal;
@@ -231,7 +231,7 @@ public:
 #ifndef SWIG
        t_12V_relais_state m_12V_relais_state;  // 12V relais output on/off
 
-       __u8 slot_mask; // useable by slot ( 1 | 2 | 4...)
+       int m_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)
@@ -242,7 +242,26 @@ public:
        std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
        eDVBSatelliteDiseqcParameters m_diseqc_parameters;
        eDVBSatelliteRotorParameters m_rotor_parameters;
+
+       int m_prio; // to override automatic tuner management ... -1 is Auto
 #endif
+public:
+#define guard_offset_min -8000
+#define guard_offset_max 8000
+#define guard_offset_step 8000
+#define MAX_SATCR 8
+#define MAX_LNBNUM 32
+
+       int SatCR_idx;
+       unsigned int SatCRvco;
+       unsigned int UnicableTuningWord;
+       unsigned int UnicableConfigWord;
+       int old_frequency;
+       int old_polarisation;
+       int old_orbital_position;
+       int guard_offset_old;
+       int guard_offset;
+       int LNBNum;
 };
 
 class eDVBRegisteredFrontend;
@@ -252,7 +271,8 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
        DECLARE_REF(eDVBSatelliteEquipmentControl);
 public:
        enum {
-               DELAY_AFTER_CONT_TONE=0,  // delay after continuous tone change
+               DELAY_AFTER_CONT_TONE_DISABLE_BEFORE_DISEQC=0,  // delay after continuous tone disable before diseqc command
+               DELAY_AFTER_FINAL_CONT_TONE_CHANGE, // delay after continuous tone change before tune
                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
@@ -278,7 +298,7 @@ private:
        int m_lnbidx; // current index for set parameters
        std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
        eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends, &m_avail_simulate_frontends;
-       bool m_rotorMoving;
+       int m_rotorMoving;
        int m_not_linked_slot_mask;
        bool m_canMeasureInputPower;
 #endif
@@ -304,6 +324,8 @@ public:
        RESULT setLNBLOFH(int lofh);
        RESULT setLNBThreshold(int threshold);
        RESULT setLNBIncreasedVoltage(bool onoff);
+       RESULT setLNBPrio(int prio);
+       RESULT setLNBNum(int LNBNum);
 /* DiSEqC Specific Parameters */
        RESULT setDiSEqCMode(int diseqcmode);
        RESULT setToneburst(int toneburst);
@@ -321,6 +343,12 @@ public:
        RESULT setUseInputpower(bool onoff);
        RESULT setInputpowerDelta(int delta);  // delta between running and stopped rotor
        RESULT setRotorTurningSpeed(int speed);  // set turning speed..
+/* Unicable Specific Parameters */
+       RESULT setLNBSatCR(int SatCR_idx);
+       RESULT setLNBSatCRvco(int SatCRvco);
+//     RESULT checkGuardOffset(const eDVBFrontendParametersSatellite &sat);
+       RESULT getLNBSatCR();
+       RESULT getLNBSatCRvco();
 /* Satellite Specific Parameters */
        RESULT addSatellite(int orbital_position);
        RESULT setVoltageMode(int mode);
@@ -331,7 +359,7 @@ public:
        RESULT setTunerDepends(int from, int to);
        void setSlotNotLinked(int tuner_no);
 
-       void setRotorMoving(bool); // called from the frontend's
+       void setRotorMoving(int, bool); // called from the frontend's
        bool isRotorMoving();
        bool canMeasureInputPower() { return m_canMeasureInputPower; }
 };