aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/sec.cpp
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-07-19 17:00:51 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-07-19 17:00:51 +0000
commit0855ea4ed4197c0fc6a8f8fff5820741d80c6d41 (patch)
treea7472d5b6994739ec79174517827ff3cc9752419 /lib/dvb/sec.cpp
parent5fc2635967a60400e54854500332e2be21b88b79 (diff)
downloadenigma2-0855ea4ed4197c0fc6a8f8fff5820741d80c6d41.tar.gz
enigma2-0855ea4ed4197c0fc6a8f8fff5820741d80c6d41.zip
now link dvb-s frontends to dvb-s2 frontends is possible
Diffstat (limited to 'lib/dvb/sec.cpp')
-rw-r--r--lib/dvb/sec.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 0f43d77f..8a186014 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -296,7 +296,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
{
eDVBSatelliteSwitchParameters &sw_param = sit->second;
bool doSetFrontend = true;
- bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
+ bool doSetVoltageToneFrontend = true;
bool allowDiseqc1_2 = true;
long band=0,
voltage = iDVBFrontend::voltageOff,
@@ -318,11 +318,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
frontend.getData(eDVBFrontend::ROTOR_POS, curRotorPos);
frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);
- if (satposDependPtr != -1 && !doSetVoltageToneFrontend)
- {
+ if (satposDependPtr != -1 && !(m_not_linked_slot_mask & slot_id))
allowDiseqc1_2 = false;
- doSetVoltageToneFrontend = true;
- }
if ( sat.frequency > lnb_param.m_lof_threshold )
band |= 1;
@@ -428,7 +425,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
eDebugNoNewLine("0");
eDebug("");
#endif
-
if (doSetVoltageToneFrontend)
{
int RotorCmd=-1;