X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9982cd52929f624aaeafcc050fa4f94bf4f53f4e..f7bc48ee3a738ec6edb3e7eedec753b106f945f9:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index ff3f9bd0..1e75d113 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -114,12 +114,12 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	setRotorPosNum(1); // stored pos 1
 }
 
-static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
+static void checkLinkedParams(int direction, long &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
 {
 	eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
 	if (linked_fe->m_inuse)
 	{
-		int ocsw = -1,
+		long ocsw = -1,
 			oucsw = -1,
 			oToneburst = -1;
 		linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
@@ -145,7 +145,7 @@ static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eD
 //		else
 //			eDebug("OK .. can tune this transponder with linked tuner in use :)");
 	}
-	linked_fe->m_frontend->getData(direction, linked_ptr);
+	linked_fe->m_frontend->getData(direction, (long&)linked_ptr);
 }
 
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
@@ -166,7 +166,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 				lnb_param.m_satellites.find(sat.orbital_position);
 			if ( sit != lnb_param.m_satellites.end())
 			{
-				int band=0,
+				long band=0,
 					linked_prev_ptr=-1,
 					linked_next_ptr=-1,
 					satpos_depends_ptr=-1,
@@ -298,7 +298,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			bool doSetFrontend = true;
 			bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
 			bool allowDiseqc1_2 = true;
-			int band=0,
+			long band=0,
 				voltage = iDVBFrontend::voltageOff,
 				tone = iDVBFrontend::toneOff,
 				csw = di_param.m_committed_cmd,
@@ -550,6 +550,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							for ( int i = 0; i < loops;)  // fill commands...
 							{
 								eDVBDiseqcCommand diseqc;
+								memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
 								diseqc.len = 4;
 								diseqc.data[0] = i ? 0xE1 : 0xE0;
 								diseqc.data[1] = 0x10;
@@ -607,7 +608,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						}
 					}
 
-					eDebug("RotorCmd %02x, lastRotorCmd %02x", RotorCmd, lastRotorCmd);
+					eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
 					if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 					{
 						eSecCommand::pair compare;
@@ -637,6 +638,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
 
 						eDVBDiseqcCommand diseqc;
+						memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
 						diseqc.len = 3;
 						diseqc.data[0] = 0xE0;
 						diseqc.data[1] = 0x31;	// positioner
@@ -814,6 +816,18 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 	//reset some tuner configuration
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
 	{
+		long tmp;
+		if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !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);
@@ -1155,7 +1169,7 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			do 
 			{
-				int tmp;
+				long tmp;
 				p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
 				if (tmp != -1)
 					p1 = (eDVBRegisteredFrontend*)tmp;
@@ -1166,7 +1180,7 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			do 
 			{
-				int tmp;
+				long tmp;
 				p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
 				if (tmp != -1)
 					p2 = (eDVBRegisteredFrontend*)tmp;
@@ -1177,8 +1191,8 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			if (p1 != p2)
 			{
-				int tmp1=-1;
-				int tmp2=-1;
+				long tmp1=-1;
+				long tmp2=-1;
 				// check for rotor dependency
 				p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
 				if (tmp1 != -1)
@@ -1255,8 +1269,19 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 		}
 		if (p1 && p2)
 		{
-			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
-			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
+			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()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)"))
+			{
+				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);
+				}
+			}
 			return 0;
 		}
 	}
@@ -1281,8 +1306,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 	}
 	if (p1 && p2)
 	{
-		p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p2);
-		p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p1);
+		p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+		p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
 		return 0;
 	}
 	return -1;