X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/00c568ef3ca9e6b4a072f1ff056741c9449aff2d..f2c69b1c3a49b8b03866894fe3e3f3a4f330f517:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index e6ff5e18..3e2efbe7 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -17,8 +17,8 @@
 #define BANDWIDTH_AUTO			(BandWidth)3
 #define GUARD_INTERVAL_AUTO		(GuardInterval)4
 #define HIERARCHY_AUTO			(Hierarchy)4
-#define parm_frequency parm_Frequency
-#define parm_inversion parm_Inversion
+#define parm_frequency parm.Frequency
+#define parm_inversion parm.Inversion
 #define parm_u_qpsk_symbol_rate parm.u.qpsk.SymbolRate
 #define parm_u_qpsk_fec_inner parm.u.qpsk.FEC_inner
 #define parm_u_qam_symbol_rate parm.u.qam.SymbolRate
@@ -53,6 +53,14 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
+void eDVBDiseqcCommand::setData(const char *str)
+{
+	len = strlen(str);
+	if (len > MAX_DISEQC_LENGTH)
+		len = MAX_DISEQC_LENGTH;
+	memcpy(data, str, len);
+}
+
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
 {
 	frequency    = descriptor.getFrequency() * 10;
@@ -607,7 +615,7 @@ void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 	case FEC_7_8:
 		tmp = "FEC_7_8";
 		break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
 	case FEC_8_9:
 		tmp = "FEC_8_9";
 		break;
@@ -1229,6 +1237,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 				parm_u_qpsk_fec_inner = FEC_7_8;
 				break;
 		}
+		// FIXME !!! get frequency range from tuner
+		if ( parm_frequency < 900000 || parm_frequency > 2200000 )
+		{
+			eDebug("%d mhz out of tuner range.. dont tune", parm_frequency/1000);
+			return -EINVAL;
+		}
 		eDebug("tuning to %d mhz", parm_frequency/1000);
 	}
 	return res;
@@ -1293,7 +1307,7 @@ RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
 	case eDVBFrontendParametersCable::FEC::f7_8:
 		parm_u_qam_fec_inner = FEC_7_8;
 		break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
 	case eDVBFrontendParametersCable::FEC::f8_9:
 		parm_u_qam_fec_inner = FEC_8_9;
 		break;