X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/85f2616ef78700cf2639992abaf1011ecaa897bd..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/sec.h

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 0720beeb..499e3737 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();
 	}
@@ -242,7 +256,7 @@ 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
@@ -278,7 +292,9 @@ public:
 	RESULT setRotorPosNum(int rotor_pos_num);
 /* Tuner Specific Parameters */
 	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();
 };