Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupported_tuner_management'

3 files changed, 31 insertions, 42 deletions

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 40d44186..51629452 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -320,27 +320,34 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 		PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
 		return NULL;
 	}
-	if ((unsigned int)PyList_Size(list) != m_frontend.size())
+	unsigned int assigned=0;
+	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
 	{
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			++assigned;
+			break;
+		}
+	}
+	if (assigned != m_frontend.size()) {
 		char blasel[256];
-		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
-			m_frontend.size(), PyList_Size(list));
+		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+			m_frontend.size(), assigned);
 		PyErr_SetString(PyExc_StandardError, blasel);
 		return NULL;
 	}
-	int pos=0;
-	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
-	}
-	pos=0;
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_simulate_frontend.begin()); i != m_simulate_frontend.end(); ++i)
 	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			break;
+		}
 	}
 	Py_RETURN_NONE;
 }
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 01288d16..ebdad8a7 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -2700,17 +2700,23 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
 
 bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {
-	ePyObject Id, Descr, Enabled, IsDVBS2;
-	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 4)
+	ePyObject Id, Descr, Enabled, IsDVBS2, frontendId;
+	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 5)
 		goto arg_error;
 	Id = PyTuple_GET_ITEM(obj, 0);
 	Descr = PyTuple_GET_ITEM(obj, 1);
 	Enabled = PyTuple_GET_ITEM(obj, 2);
 	IsDVBS2 = PyTuple_GET_ITEM(obj, 3);
-	if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2))
+	frontendId = PyTuple_GET_ITEM(obj, 4);
+	m_slotid = PyInt_AsLong(Id);
+	if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2) || !PyInt_Check(frontendId))
 		goto arg_error;
 	strcpy(m_description, PyString_AS_STRING(Descr));
-	m_slotid = PyInt_AsLong(Id);
+	if (PyInt_AsLong(frontendId) == -1 || PyInt_AsLong(frontendId) != m_dvbid) {
+//		eDebugNoSimulate("skip slotinfo for slotid %d, descr %s",
+//			m_slotid, m_description);
+		return false;
+	}
 	m_enabled = Enabled == Py_True;
 	// HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
 	m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") ||
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index a8292c0c..d48d44e1 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -1004,19 +1004,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);
@@ -1448,17 +1435,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;