X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a4cadca93a60d5a5019d2a063e39d66f50e576e2..6aa0ed7fff929c4b2651667ab809d0ace1dac56d:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index e0bf5fd3..86f549c2 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -544,7 +544,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 					compare.steps = +3;
 					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-					// voltage was disabled..so we wait a longer time .. for normal switches 500ms should be enough
+					// voltage was disabled..so we wait a longer time .. for normal switches 750ms should be enough
 					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) );
 
 					for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
@@ -562,8 +562,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						if ( send_mask & 2 )
 							++loops;
 
-						for ( int i=0; i < di_param.m_repeats; ++i )
-							loops *= 2;
+						loops <<= di_param.m_repeats;
 
 						for ( int i = 0; i < loops;)  // fill commands...
 						{
@@ -598,7 +597,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									cmd=0x38;
 								if (cmd)
 								{
-									static int delay = (120 - 54) / 2;  // standard says 100msek between two repeated commands
+									int delay = di_param.m_repeats ? (120 - 54) / 2 : 120;  // standard says 100msek between two repeated commands
 									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) );
 									diseqc.data[2]=cmd;
 									diseqc.data[3]=(cmd==0x38) ? csw : ucsw;
@@ -774,9 +773,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			else
 				csw = band;
 
-			frontend.setData(eDVBFrontend::NEW_CSW, csw);
-			frontend.setData(eDVBFrontend::NEW_UCSW, ucsw);
-			frontend.setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
+			frontend.setData(eDVBFrontend::CSW, csw);
+			frontend.setData(eDVBFrontend::UCSW, ucsw);
+			frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
 
 			if (!linked && doSetVoltageToneFrontend)
 			{