X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fsec.h;h=b38671d221c46c417a4038e6afd2dd1f4986d0d3;hp=42e53ebe1b066cb7cda2941bc093a598d3fcf76a;hb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013;hpb=793a21597557994f9e57ce16df22437fa38bd45e

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 42e53eb..b38671d 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -25,7 +25,8 @@ public:
 		IF_TONE_GOTO, IF_NOT_TONE_GOTO,
 		START_TUNE_TIMEOUT,
 		SET_ROTOR_MOVING,
-		SET_ROTOR_STOPPED
+		SET_ROTOR_STOPPED,
+		DELAYED_CLOSE_FRONTEND
 	};
 	int cmd;
 	struct rotor
@@ -103,6 +104,11 @@ public:
 	{
 		secSequence.push_back(cmd);
 	}
+	void push_back(eSecCommandList &list)
+	{
+		ASSERT(*this != list);
+		secSequence.splice(end(), list.secSequence);
+	}
 	void clear()
 	{
 		secSequence.clear();
@@ -170,7 +176,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 +237,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 +248,27 @@ 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_positions;
+	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 +278,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
@@ -267,6 +294,8 @@ public:
 		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
+		DELAY_AFTER_DISEQC_RESET_CMD,
+		DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD,
 		MAX_PARAMS
 	};
 private:
@@ -276,7 +305,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
@@ -289,6 +318,7 @@ public:
 #ifndef SWIG
 	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends, eSmartPtrList<eDVBRegisteredFrontend> &avail_simulate_frontends);
 	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int tunetimeout);
+	void prepareTurnOffSatCR(iDVBFrontend &frontend, int satcr); // used for unicable
 	int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id, int *highest_score_lnb=0);
 	bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
 #endif
@@ -302,6 +332,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);
@@ -319,6 +351,13 @@ 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 setLNBSatCRpositions(int SatCR_positions);
+	RESULT getLNBSatCR();
+	RESULT getLNBSatCRvco();
+	RESULT getLNBSatCRpositions();
 /* Satellite Specific Parameters */
 	RESULT addSatellite(int orbital_position);
 	RESULT setVoltageMode(int mode);
@@ -329,7 +368,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; }
 };