X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3df16a12b479b1d4cfddf75f9129ce652855f1b7..225c99450eab2aba7aa0e8ea3d2ff73da2910d46:/lib/dvb/sec.h

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 8a51f331..e5273f8e 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_sec_h
 #define __dvb_sec_h
 
-#include <config.h>
 #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,
-	 	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<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())
@@ -88,15 +102,15 @@ public:
 		secSequence.clear();
 		cur=secSequence.end();
 	}
-	inline std::list<eSecCommand>::iterator &current()
+	inline iterator &current()
 	{
 		return cur;
 	}
-	inline std::list<eSecCommand>::iterator begin()
+	inline iterator begin()
 	{
 		return secSequence.begin();
 	}
-	inline std::list<eSecCommand>::iterator end()
+	inline iterator end()
 	{
 		return secSequence.end();
 	}
@@ -226,6 +240,24 @@ 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
+		MAX_PARAMS
+	};
+private:
 #ifndef SWIG
 	static eDVBSatelliteEquipmentControl *instance;
 	eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough
@@ -238,17 +270,17 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 	eDVBSatelliteEquipmentControl();
 	~eDVBSatelliteEquipmentControl();
 #endif
-	// helper function for setTunerLinked and setTunerDepends
-	RESULT setDependencyPointers( int no1, int no2, int dest_data_byte );
+	static int m_params[MAX_PARAMS];
 public:
 #ifndef SWIG
 	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &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();
@@ -282,6 +314,7 @@ public:
 	RESULT setTunerLinked(int from, int to);
 	RESULT setTunerDepends(int from, int to);
 
+	PyObject *get_exclusive_satellites(int tu1, int tu2);
 	void setRotorMoving(bool); // called from the frontend's
 	bool isRotorMoving();
 };