X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d2c297e62af0b7325ae058fdd5656044f0917bdd..af6a8a3a102ff0230fcc6d90ad213e2e7d706fa8:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index c702970b..6d683267 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_frontend_h
 #define __dvb_frontend_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/sec.h>
 
@@ -43,7 +42,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	char m_filename[128];
 #if HAVE_DVB_API_VERSION < 3
 	int m_secfd;
-	char m_secfilename[128];
+	char m_sec_filename[128];
 #endif
 
 	FRONTENDPARAMETERS parm;
@@ -57,7 +56,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	int m_data[8]; /* when satellite frontend then
+	int m_data[10]; /* when satellite frontend then
 		data[0] = lastcsw -> state of the committed switch
 		data[1] = lastucsw -> state of the uncommitted switch
 		data[2] = lastToneburst -> current state of toneburst switch
@@ -65,11 +64,15 @@ class eDVBFrontend: public iDVBFrontend, public Object
 		data[4] = newRotorPos -> current Rotor Position
 		data[5] = curRotorCmd
 		data[6] = curRotorPos
-		data[7] = linkedToTunerNo */
+		data[7] = linkedToTunerNo
+		data[8] = dependsToTunerNo (just satpos.. for rotor with twin lnb)
+		data[9] = previousFrequencyOffset */
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
+
 	int m_timeoutCount; // needed for timeout
+	int m_retryCount; // diseqc retry for rotor
 	int m_curVoltage;
 
 	void feEvent(int);
@@ -84,6 +87,9 @@ public:
 
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
+	RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+	RESULT prepare_cable(const eDVBFrontendParametersCable &);
+	RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
 	RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
 	RESULT getState(int &state);
 	RESULT setTone(int tone);
@@ -95,7 +101,9 @@ public:
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
+	PyObject *readTransponderData(bool original);
+
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
 	int getID() { return m_fe; }