fix os import

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 8861740795778e1eba7f8b64ea156f9f95cb01f6..dba5565100fff7c68c871bf4c0ae2aca592df7b0 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -180,6 +180,7 @@ class eDVBSatelliteRotorParameters
 #endif
 public:
        enum { NORTH, SOUTH, EAST, WEST };
+       enum { FAST, SLOW };
 #ifndef SWIG
        eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
@@ -187,6 +188,7 @@ public:
        {
                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;
 
@@ -201,6 +203,7 @@ public:
 
        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;
@@ -222,7 +225,7 @@ public:
 #ifndef SWIG
        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)
@@ -253,7 +256,9 @@ public:
                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:
@@ -264,6 +269,7 @@ private:
        std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
        eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends;
        bool m_rotorMoving;
+       int m_not_linked_slot_mask;
 #endif
 #ifdef SWIG
        eDVBSatelliteEquipmentControl();
@@ -283,7 +289,7 @@ public:
        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);
@@ -304,6 +310,7 @@ public:
        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);
@@ -312,6 +319,7 @@ public:
 /* 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