use hex instead of decimal

[enigma2.git] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 8c5b757a6b532bd7e3c69389e62874215089e739..cfe25d1a80e37c6f9a388f7e9c0460b4d85bd707 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -2,10 +2,6 @@
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>

-#include <lib/dvb/sec.h>
-
-class eSecCommandList;
-

 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
        DECLARE_REF(eDVBFrontendParameters);
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
        DECLARE_REF(eDVBFrontendParameters);


@@ -18,21 +14,27 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
        int m_type;
 public:
        eDVBFrontendParameters();
        int m_type;
 public:
        eDVBFrontendParameters();

+       ~eDVBFrontendParameters() {}

        
        RESULT getSystem(int &type) const;
        
        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(const eDVBFrontendParametersSatellite &p);
+       RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);

        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &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, bool exact) 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);
 class eDVBFrontend: public iDVBFrontend, public Object
 {
        DECLARE_REF(eDVBFrontend);


@@ -56,23 +58,30 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        eSecCommandList m_sec_sequence;
 
 
        eSecCommandList m_sec_sequence;
 

-       int m_data[9]; /* 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] = 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) */
+       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];

 
        int m_idleInputpower[2];  // 13V .. 18V
        int m_runningInputpower;
 
        int m_timeoutCount; // needed for timeout
        int m_retryCount; // diseqc retry for rotor
 
        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 feEvent(int);
        void timeout();


@@ -100,8 +109,10 @@ public:
        RESULT getData(int num, int &data);
        RESULT setData(int num, int val);
 
        RESULT getData(int num, int &data);
        RESULT setData(int num, int val);
 

-       int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
-       PyObject *readTransponderData();
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
+       void getFrontendStatus(ePyObject dest);
+       void getTransponderData(ePyObject dest, bool original);
+       void getFrontendData(ePyObject dest);

 
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getID() { return m_fe; }
 
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getID() { return m_fe; }


@@ -110,4 +121,5 @@ public:
        int closeFrontend();
 };
 
        int closeFrontend();
 };
 

+#endif // SWIG

 #endif
 #endif