X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f05081e0c3880e537a9c1bd8ce98e8f0415d2ff3..dab6f160e5c3b7db288bc081910a52a2ee3b782f:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 4c5317e0..a05963cd 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -288,7 +288,9 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_c
 	m_tuneTimer = new eTimer(eApp);
 	CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
 
-	memset(m_data, 0xFFFF, sizeof(m_data));
+	int entries = sizeof(m_data) / sizeof(int);
+	for (int i=0; i<entries; ++i)
+		m_data[i] = -1;
 
 	return;
 }
@@ -645,39 +647,45 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	}
 	case feCable:
 	{
+#if HAVE_DVB_API_VERSION >= 3
 		eDVBFrontendParametersCable feparm;
 		if (where.getDVBC(feparm))
 			return -EINVAL;
 #if HAVE_DVB_API_VERSION < 3
-		parm.Frequency = feparm.frequency;
+		parm.Frequency = feparm.frequency * 1000;
+		parm.u.qam.SymbolRate = feparm.symbol_rate;
 #else
-		parm.frequency = feparm.frequency;
-#endif
-
+		parm.frequency = feparm.frequency * 1000;
 		parm.u.qam.symbol_rate = feparm.symbol_rate;
-
+#endif
+		fe_modulation_t mod;
 		switch (feparm.modulation)
 		{
 		case eDVBFrontendParametersCable::Modulation::QAM16:
-			parm.u.qam.modulation = QAM_16;
+			mod = QAM_16;
 			break;
 		case eDVBFrontendParametersCable::Modulation::QAM32:
-			parm.u.qam.modulation = QAM_32;
+			mod = QAM_32;
 			break;
 		case eDVBFrontendParametersCable::Modulation::QAM64:
-			parm.u.qam.modulation = QAM_64;
+			mod = QAM_64;
 			break;
 		case eDVBFrontendParametersCable::Modulation::QAM128:
-			parm.u.qam.modulation = QAM_128;
+			mod = QAM_128;
 			break;
 		case eDVBFrontendParametersCable::Modulation::QAM256:
-			parm.u.qam.modulation = QAM_256;
+			mod = QAM_256;
 			break;			
 		case eDVBFrontendParametersCable::Modulation::Auto:
-			parm.u.qam.modulation = QAM_AUTO;
+			mod = QAM_AUTO;
 			break;			
 		}
-		switch (feparm.modulation)
+#if HAVE_DVB_API_VERSION < 3
+		parm.u.qam.QAM = mod;
+#else
+		parm.u.qam.modulation = mod;
+#endif
+		switch (feparm.inversion)
 		{		
 		case eDVBFrontendParametersCable::Inversion::On:
 			#if HAVE_DVB_API_VERSION < 3
@@ -702,41 +710,51 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			parm.inversion =
 			#endif
 				INVERSION_AUTO;
-			break;						
+			break;
 		}
+		
+		fe_code_rate_t fec_inner;
 		switch (feparm.fec_inner)
 		{		
 		case eDVBFrontendParametersCable::FEC::fNone:
-			parm.u.qam.fec_inner = FEC_NONE;
+			fec_inner = FEC_NONE;
 			break;
 		case eDVBFrontendParametersCable::FEC::f1_2:
-			parm.u.qam.fec_inner = FEC_1_2;
+			fec_inner = FEC_1_2;
 			break;
 		case eDVBFrontendParametersCable::FEC::f2_3:
-			parm.u.qam.fec_inner = FEC_2_3;
+			fec_inner = FEC_2_3;
 			break;
 		case eDVBFrontendParametersCable::FEC::f3_4:
-			parm.u.qam.fec_inner = FEC_3_4;
+			fec_inner = FEC_3_4;
 			break;
 		case eDVBFrontendParametersCable::FEC::f4_5:
-			parm.u.qam.fec_inner = FEC_4_5;
+			fec_inner = FEC_4_5;
 			break;
 		case eDVBFrontendParametersCable::FEC::f5_6:
-			parm.u.qam.fec_inner = FEC_5_6;
+			fec_inner = FEC_5_6;
 			break;
 		case eDVBFrontendParametersCable::FEC::f6_7:
-			parm.u.qam.fec_inner = FEC_6_7;
+			fec_inner = FEC_6_7;
 			break;
 		case eDVBFrontendParametersCable::FEC::f7_8:
-			parm.u.qam.fec_inner = FEC_7_8;
+			fec_inner = FEC_7_8;
 			break;
 		case eDVBFrontendParametersCable::FEC::f8_9:
-			parm.u.qam.fec_inner = FEC_8_9;
+			fec_inner = FEC_8_9;
 			break;
 		case eDVBFrontendParametersCable::FEC::fAuto:
-			parm.u.qam.fec_inner = FEC_AUTO;
+			fec_inner = FEC_AUTO;
 			break;
 		}
+#if HAVE_DVB_API_VERSION < 3
+		parm.u.qam.FEC_inner = fec_inner;
+#else
+		parm.u.qam.fec_inner = fec_inner;
+#endif
+#else
+		eFatal("Old API not fully supported");
+#endif // old api
 		break;
 	}
 	case feTerrestrial:
@@ -979,7 +997,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
 
 RESULT eDVBFrontend::getData(int num, int &data)
 {
-	if ( num < 7 )
+	if ( num < (int)(sizeof(m_data)/sizeof(int)) )
 	{
 		data = m_data[num];
 		return 0;
@@ -989,7 +1007,7 @@ RESULT eDVBFrontend::getData(int num, int &data)
 
 RESULT eDVBFrontend::setData(int num, int val)
 {
-	if ( num < 7 )
+	if ( num < (int)(sizeof(m_data)/sizeof(int)) )
 	{
 		m_data[num] = val;
 		return 0;
@@ -999,14 +1017,16 @@ RESULT eDVBFrontend::setData(int num, int val)
 
 int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
 {
-	if (m_type != eDVBFrontend::feSatellite)
-		return 1;
-
-	ASSERT(m_sec);
-
-	eDVBFrontendParametersSatellite sat_parm;
-
-	ASSERT(!feparm->getDVBS(sat_parm));
+	int type;
+	if (feparm->getSystem(type) || type != m_type)
+		return 0;
 
-	return m_sec->canTune(sat_parm, this, 1 << m_fe);
+	if (m_type == eDVBFrontend::feSatellite)
+	{
+		ASSERT(m_sec);
+		eDVBFrontendParametersSatellite sat_parm;
+		ASSERT(!feparm->getDVBS(sat_parm));
+		return m_sec->canTune(sat_parm, this, 1 << m_fe);
+	}
+	return 1;
 }