X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0980594e3037839b361eae71646ccf960aaa2659..0855ea4ed4197c0fc6a8f8fff5820741d80c6d41:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 41de874b..111e715d 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -31,6 +31,7 @@ public:
 	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
 
 	RESULT getHash(unsigned long &) const;
+	RESULT calcLockTimeout(unsigned int &) const;
 };
 
 #ifndef SWIG
@@ -40,6 +41,25 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
+public:
+	enum {
+		CSW,                  // state of the committed switch
+		UCSW,                 // state of the uncommitted switch
+		TONEBURST,            // current state of toneburst switch
+		NEW_ROTOR_CMD,        // prev sent rotor cmd
+		NEW_ROTOR_POS,        // new rotor position (not validated)
+		ROTOR_CMD,            // completed rotor cmd (finalized)
+		ROTOR_POS,            // current rotor position
+		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
+		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
+		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
+		FREQ_OFFSET,          // current frequency offset
+		CUR_VOLTAGE,          // current voltage
+		CUR_TONE,             // current continuous tone
+		NUM_DATA_ENTRIES
+	};
+	Signal1<void,iDVBFrontend*> m_stateChanged;
+private:
 	DECLARE_REF(eDVBFrontend);
 	bool m_enabled;
 	int m_type;
@@ -47,16 +67,15 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	int m_slotid;
 	int m_fd;
 	bool m_need_rotor_workaround;
+	bool m_can_handle_dvbs2;
 	char m_filename[128];
 	char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
 	int m_secfd;
 	char m_sec_filename[128];
 #endif
-
 	FRONTENDPARAMETERS parm;
 	int m_state;
-	Signal1<void,iDVBFrontend*> m_stateChanged;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
 	eSocketNotifier *m_sn;
 	int m_tuning;
@@ -65,24 +84,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	enum {
-		CSW,                  // state of the committed switch
-		UCSW,                 // state of the uncommitted switch
-		TONEBURST,            // current state of toneburst switch
-		NEW_ROTOR_CMD,        // prev sent rotor cmd
-		NEW_ROTOR_POS,        // new rotor position (not validated)
-		ROTOR_CMD,            // completed rotor cmd (finalized)
-		ROTOR_POS,            // current rotor position
-		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
-		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
-		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
-		FREQ_OFFSET,          // current frequency offset
-		CUR_VOLTAGE,          // current voltage
-		CUR_TONE,             // current continuous tone
-		NUM_DATA_ENTRIES
-	};
-
-	int m_data[NUM_DATA_ENTRIES];
+	long m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
@@ -94,7 +96,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
 	void setFrontend();
-	int readInputpower();
 	bool setSecSequencePos(int steps);
 	void setRotorData(int pos, int cmd);
 	static int PriorityOrder;
@@ -102,9 +103,10 @@ public:
 	eDVBFrontend(int adap, int fe, int &ok);	
 	virtual ~eDVBFrontend();
 
+	int readInputpower();
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
-	RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+	RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
 	RESULT prepare_cable(const eDVBFrontendParametersCable &);
 	RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
 	RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
@@ -115,8 +117,8 @@ public:
 	RESULT sendToneburst(int burst);
 	RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
 	RESULT setSecSequence(const eSecCommandList &list);
-	RESULT getData(int num, int &data);
-	RESULT setData(int num, int val);
+	RESULT getData(int num, long &data);
+	RESULT setData(int num, long val);
 
 	int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, signalQuality, locked, synced
 	void getFrontendStatus(ePyObject dest);
@@ -131,7 +133,8 @@ public:
 	static int getTypePriorityOrder() { return PriorityOrder; }
 
 	int openFrontend();
-	int closeFrontend();
+	int closeFrontend(bool force=false);
+	const char *getDescription() const { return m_description; }
 };
 
 #endif // SWIG