X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1ab30fb1e63cb408ae1da3534910c3082a1d03dd..184ec9e63bb487fa942270a6153ca0789e877b22:/lib/dvb/frontend.cpp?ds=sidebyside

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index c6a52056..05f354e9 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -125,6 +125,7 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
 	if ( fec != FEC::fNone && fec > FEC::f9_10 )
 		fec = FEC::fAuto;
 	inversion = Inversion::Unknown;
+	pilot = Pilot::Unknown;
 	orbital_position  = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
 	orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
 	orbital_position += ((descriptor.getOrbitalPosition() >> 4) & 0xF) * 10;
@@ -138,16 +139,16 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto
 		eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK");
 		modulation=QPSK;
 	}
-	roll_off = descriptor.getRollOff();
+	rolloff = 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",
+		eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, rolloff %d",
 			frequency,
 			polarisation ? "hor" : "vert",
 			orbital_position,
 			symbol_rate, fec,
 			modulation,
-			roll_off);
+			rolloff);
 	}
 	else
 	{
@@ -371,9 +372,42 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
 	}
 	case iDVBFrontend::feCable:
 		hash = 0xFFFF0000;
+		hash |= (cable.frequency/1000)&0xFFFF;
 		return 0;
 	case iDVBFrontend::feTerrestrial:
 		hash = 0xEEEE0000;
+		hash |= (terrestrial.frequency/1000)&0xFFFF;
+		return 0;
+	default:
+		return -1;
+	}
+}
+
+RESULT eDVBFrontendParameters::calcLockTimeout(unsigned int &timeout) const
+{
+	switch (m_type)
+	{
+	case iDVBFrontend::feSatellite:
+	{
+			/* high symbol rate transponders tune faster, due to 
+				requiring less zigzag and giving more symbols faster. 
+
+				5s are definitely not enough on really low SR when
+				zigzag has to find the exact frequency first.
+			*/
+		if (sat.symbol_rate > 20000000)
+			timeout = 5000;
+		else if (sat.symbol_rate > 10000000)
+			timeout = 10000;
+		else
+			timeout = 20000;
+		return 0;
+	}
+	case iDVBFrontend::feCable:
+		timeout = 5000;
+		return 0;
+	case iDVBFrontend::feTerrestrial:
+		timeout = 5000;
 		return 0;
 	default:
 		return -1;
@@ -506,7 +540,7 @@ int eDVBFrontend::closeFrontend()
 				m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
 			return -1;
 		}
-		linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (int&)linked_fe);
+		linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (long&)linked_fe);
 	}
 	if (m_fd >= 0)
 	{
@@ -751,8 +785,8 @@ void PutToDict(ePyObject &dict, const char*key, const char *value)
 
 void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
 {
-	int freq_offset=0;
-	int csw=0;
+	long freq_offset=0;
+	long csw=0;
 	const char *tmp=0;
 	fe->getData(eDVBFrontend::CSW, csw);
 	fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
@@ -821,22 +855,61 @@ void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, e
 		break;
 #endif
 	}
+	PutToDict(dict, "fec_inner", tmp);
 #if HAVE_DVB_API_VERSION >=3
 	PutToDict(dict, "modulation",
 		parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" );
+	if (parm_u_qpsk_fec_inner > FEC_AUTO)
+	{
+		switch(parm_inversion & 0xc)
+		{
+		default: // unknown rolloff
+		case 0: // 0.35
+			tmp = "ROLLOFF_0_35";
+			break;
+		case 4: // 0.25
+			tmp = "ROLLOFF_0_25";
+			break;
+		case 8: // 0.20
+			tmp = "ROLLOFF_0_20";
+			break;
+		}
+		PutToDict(dict, "rolloff", tmp);
+		if (parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10)
+		{
+			switch(parm_inversion & 0x30)
+			{
+			case 0: // pilot off
+				tmp = "PILOT_OFF";
+				break;
+			case 0x10: // pilot on
+				tmp = "PILOT_ON";
+				break;
+			case 0x20: // pilot auto
+				tmp = "PILOT_AUTO";
+				break;
+			}
+			PutToDict(dict, "pilot", tmp);
+		}
+		tmp = "DVB-S2";
+	}
+	else
+		tmp = "DVB-S";
 #else
 	PutToDict(dict, "modulation", "QPSK" );
+	tmp = "DVB-S";
 #endif
-	PutToDict(dict, "fec_inner", tmp);
-	tmp = parm_u_qpsk_fec_inner > FEC_AUTO ?
-		"DVB-S2" : "DVB-S";
 	PutToDict(dict, "system", tmp);
 }
 
 void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm)
 {
 	const char *tmp=0;
+#if HAVE_DVB_API_VERSION < 3
+	PutToDict(dict, "frequency", parm_frequency);
+#else
 	PutToDict(dict, "frequency", parm_frequency/1000);
+#endif
 	PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate);
 	switch(parm_u_qam_fec_inner)
 	{
@@ -1224,14 +1297,14 @@ void eDVBFrontend::setRotorData(int pos, int cmd)
 	else
 	{
 		eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR];
-		while ( (int)next != -1 )
+		while ( (long)next != -1 )
 		{
 			next->m_frontend->m_data[ROTOR_CMD] = cmd;
 			next->m_frontend->m_data[ROTOR_POS] = pos;
 			next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[LINKED_NEXT_PTR];
 		}
 		eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)m_data[LINKED_PREV_PTR];
-		while ( (int)prev != -1 )
+		while ( (long)prev != -1 )
 		{
 			prev->m_frontend->m_data[ROTOR_CMD] = cmd;
 			prev->m_frontend->m_data[ROTOR_POS] = pos;
@@ -1317,9 +1390,11 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				++m_sec_sequence.current();
 				break;
 			case eSecCommand::START_TUNE_TIMEOUT:
-				m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
+			{
+				m_timeout->start(m_sec_sequence.current()->timeout, 1);
 				++m_sec_sequence.current();
 				break;
+			}
 			case eSecCommand::SET_TIMEOUT:
 				m_timeoutCount = m_sec_sequence.current()++->val;
 				eDebug("[SEC] set timeout %d", m_timeoutCount);
@@ -1441,7 +1516,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				break;
 			case eSecCommand::UPDATE_CURRENT_ROTORPARAMS:
 				setRotorData(m_data[NEW_ROTOR_POS], m_data[NEW_ROTOR_CMD]);
-				eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]);
+				eDebug("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]);
 				++m_sec_sequence.current();
 				break;
 			case eSecCommand::SET_ROTOR_DISEQC_RETRYS:
@@ -1522,7 +1597,7 @@ RESULT eDVBFrontend::getFrontendType(int &t)
 	return 0;
 }
 
-RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
+RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm, unsigned int tunetimeout)
 {
 	int res;
 	if (!m_sec)
@@ -1530,7 +1605,7 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 		eWarning("no SEC module active!");
 		return -ENOENT;
 	}
-	res = m_sec->prepare(*this, parm, feparm, 1 << m_slotid);
+	res = m_sec->prepare(*this, parm, feparm, 1 << m_slotid, tunetimeout);
 	if (!res)
 	{
 		eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d",
@@ -1618,9 +1693,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 					eDebug("no valid fec for DVB-S2 set.. abort !!");
 					return -EINVAL;
 			}
-			if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+			parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff
+			if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK) {
 				parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
 				// 8PSK fec driver values are decimal 9 bigger
+				parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot
+			}
 		}
 #endif
 		// FIXME !!! get frequency range from tuner
@@ -1636,7 +1714,11 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 
 RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
 {
+#if HAVE_DVB_API_VERSION < 3
+	parm_frequency = feparm.frequency;
+#else
 	parm_frequency = feparm.frequency * 1000;
+#endif
 	parm_u_qam_symbol_rate = feparm.symbol_rate;
 	switch (feparm.modulation)
 	{
@@ -1861,6 +1943,7 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
 
 RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
+	unsigned int timeout = 5000;
 	eDebug("(%d)tune", m_dvbid);
 
 	m_timeout->stop();
@@ -1883,6 +1966,8 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	m_sn->stop();
 	m_sec_sequence.clear();
 
+	where.calcLockTimeout(timeout);
+
 	switch (m_type)
 	{
 	case feSatellite:
@@ -1895,7 +1980,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			goto tune_error;
 		}
 		m_sec->setRotorMoving(false);
-		res=prepare_sat(feparm);
+		res=prepare_sat(feparm, timeout);
 		if (res)
 			goto tune_error;
 
@@ -1913,7 +1998,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		if (res)
 			goto tune_error;
 
-		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, timeout) );
 		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
 		break;
 	}
@@ -1933,7 +2018,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		std::string enable_5V;
 		char configStr[255];
 		snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_slotid);
-		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, timeout) );
 		ePythonConfigQuery::getConfigValue(configStr, enable_5V);
 		if (enable_5V == "True")
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
@@ -2113,7 +2198,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
 	return 0;
 }
 
-RESULT eDVBFrontend::getData(int num, int &data)
+RESULT eDVBFrontend::getData(int num, long &data)
 {
 	if ( num < NUM_DATA_ENTRIES )
 	{
@@ -2123,7 +2208,7 @@ RESULT eDVBFrontend::getData(int num, int &data)
 	return -EINVAL;
 }
 
-RESULT eDVBFrontend::setData(int num, int val)
+RESULT eDVBFrontend::setData(int num, long val)
 {
 	if ( num < NUM_DATA_ENTRIES )
 	{