X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/65b45f75e4c14174a580a5345b85408fad826895..91194b42d0dc174f3e550b9a440e91fccf7e03ec:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index fce94e5e..1889b971 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -1,12 +1,7 @@
 #ifndef __dvb_frontend_h
 #define __dvb_frontend_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
-#include <lib/dvb/sec.h>
-
-class eSecCommandList;
-
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
 	DECLARE_REF(eDVBFrontendParameters);
@@ -21,27 +16,36 @@ public:
 	eDVBFrontendParameters();
 	
 	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &p) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &p) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &p) const;
+	RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
+	RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
+	RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
 
-	RESULT setDVBS(eDVBFrontendParametersSatellite &p);
-	RESULT setDVBC(eDVBFrontendParametersCable &p);
-	RESULT setDVBT(eDVBFrontendParametersTerrestrial &p);
+	RESULT setDVBS(const eDVBFrontendParametersSatellite &p);
+	RESULT setDVBC(const eDVBFrontendParametersCable &p);
+	RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
 	
-	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &diff) const;
+	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
 	
-	RESULT getHash(unsigned long &hash) const;
+	RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };
 
+#ifndef SWIG
+
+#include <lib/dvb/sec.h>
+class eSecCommandList;
+
 class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF(eDVBFrontend);
 	int m_type;
+	int m_fe;
 	int m_fd;
+	char m_filename[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;
@@ -53,22 +57,40 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	int m_data[4]; /* 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
-		data[3] = prevRotorPos -> current Rotor Position */
+		data[3] = newRotorCmd -> last sent rotor cmd
+		data[4] = newRotorPos -> current Rotor Position
+		data[5] = curRotorCmd
+		data[6] = curRotorPos
+		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);
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
 	void setFrontend();
+	int readInputpower();
+	bool setSecSequencePos(int steps);
 public:
 	eDVBFrontend(int adap, int fe, int &ok);	
 	virtual ~eDVBFrontend();
 
 	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);
@@ -79,6 +101,16 @@ public:
 	RESULT setSecSequence(const eSecCommandList &list);
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
+
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
+	PyObject *readTransponderData(bool original);
+
+	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
+	int getID() { return m_fe; }
+
+	int openFrontend();
+	int closeFrontend();
 };
 
+#endif // SWIG
 #endif