X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cc89d218402e01a1dc381a50130c6e3581a3555f..191cade7c45bee53df2776ff5bb3f26b2cdafc12:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 5d991a47..51d21105 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -57,10 +57,40 @@ 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);
+	len=0;
+	int slen = strlen(str);
+	if (slen % 2)
+	{
+		eDebug("invalid diseqc command string length (not 2 byte aligned)");
+		return;
+	}
+	if (slen > MAX_DISEQC_LENGTH*2)
+	{
+		eDebug("invalid diseqc command string length (string is to long)");
+		return;
+	}
+	unsigned char val=0;
+	for (int i=0; i < slen; ++i)
+	{
+		unsigned char c = str[i];
+		switch(c)
+		{
+			case '0' ... '9': c-=48; break;
+			case 'a' ... 'f': c-=87; break;
+			case 'A' ... 'F': c-=55; break;
+			default:
+				eDebug("invalid character in hex string..ignore complete diseqc command !");
+				return;
+		}
+		if ( i % 2 )
+		{
+			val |= c;
+			data[i/2] = val;
+		}
+		else
+			val = c << 4;
+	}
+	len = slen/2;
 }
 
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
@@ -167,9 +197,10 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con
 	return 0;
 }
 
-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)
 {
 	sat = p;
+	sat.no_rotor_command_on_tune = no_rotor_command_on_tune;
 	m_type = iDVBFrontend::feSatellite;
 	return 0;
 }
@@ -261,7 +292,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;
 	}
@@ -371,7 +406,6 @@ int eDVBFrontend::openFrontend()
 
 	m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
 	CONNECT(m_sn->activated, eDVBFrontend::feEvent);
-	m_sn->start();
 
 	return 0;
 }
@@ -392,8 +426,11 @@ int eDVBFrontend::closeFrontend()
 	if (m_fd >= 0)
 	{
 		eDebug("close frontend %d", m_fe);
+		m_tuneTimer->stop();
 		setTone(iDVBFrontend::toneOff);
 		setVoltage(iDVBFrontend::voltageOff);
+		if (m_sec)
+			m_sec->setRotorMoving(false);
 		::close(m_fd);
 		m_fd=-1;
 		m_data[0] = m_data[1] = m_data[2] = -1;
@@ -770,6 +807,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;
@@ -1175,6 +1215,8 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 void eDVBFrontend::setFrontend()
 {
 	eDebug("setting frontend %d", m_fe);
+	m_sn->start();
+	feEvent(-1);
 	if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
 	{
 		perror("FE_SET_FRONTEND failed");
@@ -1433,6 +1475,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;
@@ -1447,6 +1492,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;
 }
 
@@ -1461,8 +1519,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	if (m_type == -1)
 		return -ENODEV;
 
-	feEvent(-1);
-
+	m_sn->stop();
 	m_sec_sequence.clear();
 
 	switch (m_type)
@@ -1476,6 +1533,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			return -EINVAL;
 		}
 		res=prepare_sat(feparm);
+		m_sec->setRotorMoving(false);
 		break;
 	}
 	case feCable: