X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/63e8b4dec748b32b605fc2bff52fd786e4439077..d25cc68147eac7b8e7628a9abdffe55a758612a3:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 0cb910fb..dff3ddb9 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -332,6 +332,8 @@ int eDVBFrontend::closeFrontend()
 		}
 	}
 	eDebug("close frontend %d", m_fe);
+	setTone(iDVBFrontend::toneOff);
+	setVoltage(iDVBFrontend::voltageOff);
 	if (m_fd >= 0)
 	{
 		::close(m_fd);
@@ -347,8 +349,6 @@ int eDVBFrontend::closeFrontend()
 	delete m_sn;
 	m_sn=0;
 
-	setTone(iDVBFrontend::toneOff);
-	setVoltage(iDVBFrontend::voltageOff);
 	return 0;
 }
 
@@ -614,7 +614,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				break;
 			case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
 			{
-				int idleInputpower = m_idleInputpower[m_curVoltage == iDVBFrontend::voltage13 ? 0 : 1];
+				int idleInputpower = m_idleInputpower[ (m_curVoltage&1) ? 0 : 1];
 				eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
 				const char *txt = cmd.direction ? "running" : "stopped";
 				eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d",
@@ -965,9 +965,9 @@ RESULT eDVBFrontend::setVoltage(int voltage)
 #if HAVE_DVB_API_VERSION < 3
 	secVoltage vlt;
 #else
+	bool increased=false;
 	fe_sec_voltage_t vlt;
 #endif
-
 	m_curVoltage=voltage;
 	switch (voltage)
 	{
@@ -976,9 +976,23 @@ RESULT eDVBFrontend::setVoltage(int voltage)
 			m_data[i]=-1;
 		vlt = SEC_VOLTAGE_OFF;
 		break;
+	case voltage13_5:
+#if HAVE_DVB_API_VERSION < 3
+		vlt = SEC_VOLTAGE_13_5;
+		break;
+#else
+		increased = true;
+#endif
 	case voltage13:
 		vlt = SEC_VOLTAGE_13;
 		break;
+	case voltage18_5:
+#if HAVE_DVB_API_VERSION < 3
+		vlt = SEC_VOLTAGE_18_5;
+		break;
+#else
+		increased = true;
+#endif
 	case voltage18:
 		vlt = SEC_VOLTAGE_18;
 		break;
@@ -988,6 +1002,8 @@ RESULT eDVBFrontend::setVoltage(int voltage)
 #if HAVE_DVB_API_VERSION < 3
 	return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt);
 #else
+	if (::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0)
+		perror("FE_ENABLE_HIGH_LNB_VOLTAGE");
 	return ::ioctl(m_fd, FE_SET_VOLTAGE, vlt);
 #endif
 }