X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d76012a43ac01189160992ce3a5a08614fc93f0..ce38faaf7ce4c1320fa42109c13a60d74ab8cd9c:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 9ca0f734..a2bc8869 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -548,6 +548,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 					if ( send_mask )
 					{
+						int diseqc_repeats = diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0 ? di_param.m_repeats : 0;
 						int vlt = iDVBFrontend::voltageOff;
 						eSecCommand::pair compare;
 						compare.steps = +3;
@@ -620,7 +621,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							if ( send_mask & 2 )
 								++loops;
 
-							loops <<= di_param.m_repeats;
+							loops <<= diseqc_repeats;
 
 							for ( int i = 0; i < loops;)  // fill commands...
 							{
@@ -657,7 +658,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
 									if (cmd)
 									{
-										int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // standard says 100msek between two repeated commands
+										int delay = diseqc_repeats ? (tmp - 54) / 2 : tmp;  // 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;
@@ -1001,19 +1002,6 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 	//reset some tuner configuration
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
 	{
-		long tmp;
-		char c;
-		if (sscanf(it->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1 && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
-		{
-			FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
-			if (!f || fwrite("B", 1, 1, f) != 1)
-				eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)");
-			else
-			{
-				eDebug("set /proc/stb/tsmux/lnb_b_input to B OK");
-				fclose(f);
-			}
-		}
 		it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1);
 		it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1);
 		it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1);
@@ -1445,17 +1433,6 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 			char c;
 			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
 			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
-			if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && sscanf(p1->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1)
-			{
-				FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
-				if (!f || fwrite("A", 1, 1, f) != 1)
-					eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)");
-				else
-				{
-					eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
-					fclose(f);
-				}
-			}
 		}
 
 		p1=p2=NULL;