X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6f7a41a386c86adaac7adecdb2b43a78e31c912b..40d11af2de7aed77c90970ba2b61dd754a225117:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index e82c6d46..5d991a47 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -53,6 +53,16 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
+void eDVBDiseqcCommand::setCommandString(const char *str)
+{
+	if (!str)
+		return;
+	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 +617,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 +1239,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 +1309,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;
@@ -1438,6 +1454,8 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
 	eDebug("(%d)tune", m_fe);
 
+	m_timeout->stop();
+
 	int res=0;
 
 	if (m_type == -1)
@@ -1467,7 +1485,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			return -EINVAL;
 		res=prepare_cable(feparm);
 		if (!res)
+		{
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		}
 		break;
 	}
 	case feTerrestrial:
@@ -1480,7 +1501,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		}
 		res=prepare_terrestrial(feparm);
 		if (!res)
+		{
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		}
 		break;
 	}
 	}
@@ -1488,7 +1512,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	if (!res)  // prepare ok
 	{
 		m_tuneTimer->start(0,true);
-		m_timeout->stop();
 		m_sec_sequence.current() = m_sec_sequence.begin();
 
 		if (m_state != stateTuning)