X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2617e24d65b8e2c460aa53050166afcad41d05c2..193333b7bc72ab13d4dee5750b31c3c33041c696:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index e84e3924..c04ac146 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -47,6 +47,11 @@
 #define parm_u_ofdm_transmission_mode parm.u.ofdm.transmission_mode
 #define parm_u_ofdm_guard_interval parm.u.ofdm.guard_interval
 #define parm_u_ofdm_hierarchy_information parm.u.ofdm.hierarchy_information
+#ifdef FEC_9_10
+	#warning "FEC_9_10 already exist in dvb api ... it seems it is now ready for DVB-S2"
+#else
+	#define FEC_9_10 (fe_code_rate_t)(FEC_AUTO+1)
+#endif
 #endif
 
 #include <dvbsi++/satellite_delivery_system_descriptor.h>
@@ -99,8 +104,8 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
 	symbol_rate  = descriptor.getSymbolRate() * 100;
 	polarisation = descriptor.getPolarization();
 	fec = descriptor.getFecInner();
-	if ( fec == 0xF )
-		fec = FEC::fNone;
+	if ( fec != FEC::fNone && fec > FEC::f9_10 )
+		fec = FEC::fAuto;
 	inversion = Inversion::Unknown;
 	orbital_position  = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
 	orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
@@ -108,11 +113,32 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
 	orbital_position += ((descriptor.getOrbitalPosition()) & 0xF);
 	if (orbital_position && (!descriptor.getWestEastFlag()))
 		orbital_position = 3600 - orbital_position;
-	eDebug("SAT freq %d, %s, pos %d, sr %d, fec %d",
-		frequency,
-		polarisation ? "hor" : "vert",
-		orbital_position,
-		symbol_rate, fec);
+	system = descriptor.getModulationSystem();
+	modulation = descriptor.getModulation();
+	if (system == System::DVB_S && modulation == Modulation::M8PSK)
+	{
+		eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK");
+		modulation=QPSK;
+	}
+	roll_off = descriptor.getRollOff();
+	if (system == System::DVB_S2)
+	{
+		eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, roll_off %d",
+			frequency,
+			polarisation ? "hor" : "vert",
+			orbital_position,
+			symbol_rate, fec,
+			modulation,
+			roll_off);
+	}
+	else
+	{
+		eDebug("SAT DVB-S freq %d, %s, pos %d, sr %d, fec %d",
+			frequency,
+			polarisation ? "hor" : "vert",
+			orbital_position,
+			symbol_rate, fec);
+	}
 }
 
 void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descriptor)
@@ -144,7 +170,7 @@ void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescr
 	if (code_rate_LP > 4)
 		code_rate_LP = FEC::fAuto;
 	transmission_mode = descriptor.getTransmissionMode();
-	if (transmission_mode > 2)
+	if (transmission_mode > 1) // TM4k forced to auto
 		transmission_mode = TransmissionMode::TMAuto;
 	guard_interval = descriptor.getGuardInterval();
 	if (guard_interval > 3)
@@ -292,7 +318,11 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
 		return 0;
 	}
 	case iDVBFrontend::feCable:
+		hash = 0xFFFF0000;
+		return 0;
 	case iDVBFrontend::feTerrestrial:
+		hash = 0xEEEE0000;
+		return 0;
 	default:
 		return -1;
 	}
@@ -301,7 +331,7 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
 DEFINE_REF(eDVBFrontend);
 
 eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
-	:m_type(-1), m_fe(fe), m_fd(-1), m_timeout(0), m_tuneTimer(0)
+	:m_type(-1), m_fe(fe), m_fd(-1), m_sn(0), m_timeout(0), m_tuneTimer(0)
 #if HAVE_DVB_API_VERSION < 3
 	,m_secfd(-1)
 #endif
@@ -330,35 +360,44 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
 
 int eDVBFrontend::openFrontend()
 {
-	if (m_fd >= 0)
+	if (m_sn)
 		return -1;  // already opened
 
 	m_state=0;
 	m_tuning=0;
 
 #if HAVE_DVB_API_VERSION < 3
-	m_secfd = ::open(m_sec_filename, O_RDWR);
 	if (m_secfd < 0)
 	{
-		eWarning("failed! (%s) %m", m_sec_filename);
-		return -1;
+		m_secfd = ::open(m_sec_filename, O_RDWR);
+		if (m_secfd < 0)
+		{
+			eWarning("failed! (%s) %m", m_sec_filename);
+			return -1;
+		}
 	}
+	else
+		eWarning("sec %d already opened", m_fe);
 	FrontendInfo fe_info;
 #else
 	dvb_frontend_info fe_info;
 #endif
 	eDebug("opening frontend %d", m_fe);
-	m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
 	if (m_fd < 0)
 	{
-		eWarning("failed! (%s) %m", m_filename);
+		m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
+		if (m_fd < 0)
+		{
+			eWarning("failed! (%s) %m", m_filename);
 #if HAVE_DVB_API_VERSION < 3
-		::close(m_secfd);
-		m_secfd=-1;
+			::close(m_secfd);
+			m_secfd=-1;
 #endif
-		return -1;
+			return -1;
+		}
 	}
-
+	else
+		eWarning("frontend %d already opened", m_fe);
 	if (m_type == -1)
 	{
 		if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
@@ -425,15 +464,21 @@ int eDVBFrontend::closeFrontend()
 		m_tuneTimer->stop();
 		setTone(iDVBFrontend::toneOff);
 		setVoltage(iDVBFrontend::voltageOff);
-		::close(m_fd);
-		m_fd=-1;
+		if (m_sec)
+			m_sec->setRotorMoving(false);
+		if (!::close(m_fd))
+			m_fd=-1;
+		else
+			eWarning("couldnt close frontend %d", m_fe);
 		m_data[0] = m_data[1] = m_data[2] = -1;
 	}
 #if HAVE_DVB_API_VERSION < 3
 	if (m_secfd >= 0)
 	{
-		::close(m_secfd);
-		m_secfd=-1;
+		if (!::close(m_secfd))
+			m_secfd=-1;
+		else
+			eWarning("couldnt close sec %d", m_fe);
 	}
 #endif
 	delete m_sn;
@@ -759,6 +804,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 	case QAM_16:
 		tmp = "QAM_16";
 		break;
+	case QAM_64:
+		tmp = "QAM_64";
+		break;
 	default:
 	case QAM_AUTO:
 		tmp = "QAM_AUTO";
@@ -801,6 +849,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 	PutToDict(dict, "guard_interval", tmp);
 	switch (parm_u_ofdm_hierarchy_information)
 	{
+		case HIERARCHY_NONE:
+			tmp = "HIERARCHY_NONE";
+			break;
 		case HIERARCHY_1:
 			tmp = "HIERARCHY_1";
 			break;
@@ -1251,11 +1302,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 		switch (feparm.fec)
 		{
 			default:
-			case eDVBFrontendParametersSatellite::FEC::fNone:
-				eDebug("no fec set.. assume auto");
+				eDebug("no valid fec set.. assume auto");
 			case eDVBFrontendParametersSatellite::FEC::fAuto:
 				parm_u_qpsk_fec_inner = FEC_AUTO;
 				break;
+			case eDVBFrontendParametersSatellite::FEC::fNone:
+				parm_u_qpsk_fec_inner = FEC_NONE;
 			case eDVBFrontendParametersSatellite::FEC::f1_2:
 				parm_u_qpsk_fec_inner = FEC_1_2;
 				break;
@@ -1271,6 +1323,11 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 			case eDVBFrontendParametersSatellite::FEC::f7_8:
 				parm_u_qpsk_fec_inner = FEC_7_8;
 				break;
+#if HAVE_DVB_API_VERSION >= 3
+			case eDVBFrontendParametersSatellite::FEC::f9_10:
+				parm_u_qpsk_fec_inner = FEC_9_10;
+				break;
+#endif
 		}
 		// FIXME !!! get frequency range from tuner
 		if ( parm_frequency < 900000 || parm_frequency > 2200000 )
@@ -1427,6 +1484,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
 	case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
 		parm_u_ofdm_constellation = QAM_16;
 		break;
+	case eDVBFrontendParametersTerrestrial::Modulation::QAM64:
+		parm_u_ofdm_constellation = QAM_64;
+		break;
 	default:
 	case eDVBFrontendParametersTerrestrial::Modulation::Auto:
 		parm_u_ofdm_constellation = QAM_AUTO;
@@ -1466,6 +1526,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
 	}
 	switch (feparm.hierarchy)
 	{
+		case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+			parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
+			break;
 		case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
 			parm_u_ofdm_hierarchy_information = HIERARCHY_1;
 			break;
@@ -1480,6 +1543,19 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
 			parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
 			break;
 	}
+	switch (feparm.inversion)
+	{
+	case eDVBFrontendParametersTerrestrial::Inversion::On:
+		parm_inversion = INVERSION_ON;
+		break;
+	case eDVBFrontendParametersTerrestrial::Inversion::Off:
+		parm_inversion = INVERSION_OFF;
+		break;
+	default:
+	case eDVBFrontendParametersTerrestrial::Inversion::Unknown:
+		parm_inversion = INVERSION_AUTO;
+		break;
+	}
 	return 0;
 }
 
@@ -1508,6 +1584,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			return -EINVAL;
 		}
 		res=prepare_sat(feparm);
+		m_sec->setRotorMoving(false);
 		break;
 	}
 	case feCable: