X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/85f2616ef78700cf2639992abaf1011ecaa897bd..2dac4014cda43ec1d56d3de2ad53da8274f336d6:/lib/dvb/sec.h diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index 0720beeb..dba55651 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -1,7 +1,6 @@ #ifndef __dvb_sec_h #define __dvb_sec_h -#include #include #include @@ -13,11 +12,17 @@ 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, + IF_TUNER_LOCKED_GOTO, + IF_TONE_GOTO, IF_NOT_TONE_GOTO, + START_TUNE_TIMEOUT }; int cmd; struct rotor @@ -29,7 +34,12 @@ public: }; struct pair { - int voltage; + union + { + int voltage; + int tone; + int val; + }; int steps; }; union @@ -68,8 +78,12 @@ public: class eSecCommandList { - std::list secSequence; - std::list::iterator cur; + typedef std::list List; + List secSequence; +public: + typedef List::iterator iterator; +private: + iterator cur; public: eSecCommandList() :cur(secSequence.end()) @@ -88,15 +102,15 @@ public: secSequence.clear(); cur=secSequence.end(); } - inline std::list::iterator ¤t() + inline iterator ¤t() { return cur; } - inline std::list::iterator begin() + inline iterator begin() { return secSequence.begin(); } - inline std::list::iterator end() + inline iterator end() { return secSequence.end(); } @@ -166,6 +180,7 @@ class eDVBSatelliteRotorParameters #endif public: enum { NORTH, SOUTH, EAST, WEST }; + enum { FAST, SLOW }; #ifndef SWIG eDVBSatelliteRotorParameters() { setDefaultOptions(); } @@ -173,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; @@ -187,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; @@ -208,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) @@ -226,6 +243,25 @@ 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 @@ -233,24 +269,27 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl std::map::iterator m_curSat; eSmartPtrList &m_avail_frontends; bool m_rotorMoving; + int m_not_linked_slot_mask; #endif #ifdef SWIG eDVBSatelliteEquipmentControl(); ~eDVBSatelliteEquipmentControl(); #endif + static int m_params[MAX_PARAMS]; public: #ifndef SWIG eDVBSatelliteEquipmentControl(eSmartPtrList &avail_frontends); 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); 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 setLNBTunerMask(int tunermask); + RESULT setLNBSlotMask(int slotmask); RESULT setLNBLOFL(int lofl); RESULT setLNBLOFH(int lofh); RESULT setLNBThreshold(int threshold); @@ -271,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); @@ -278,7 +318,10 @@ public: 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(); };