X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b5f1d8881aa8369ca05be952298425a85124b665..3375bf50872aa7590af48875aac713cf3b1f646e:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index cb853e2b..1fa3cafe 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)
@@ -392,8 +422,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 +803,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;
@@ -1435,6 +1471,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;
@@ -1477,6 +1516,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			return -EINVAL;
 		}
 		res=prepare_sat(feparm);
+		m_sec->setRotorMoving(false);
 		break;
 	}
 	case feCable: