X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c1b1596392a63fbc32d9792dfa8e82ba9d8a7dc4..b7f07b6052ac2ca6b5e2a2c9e322b26e2c506109:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 3c2c22af..e6d9a25d 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -82,8 +82,32 @@ eDVBResourceManager::eDVBResourceManager()
 		num_adapter++;
 	}
 
-	eDebug("found %d adapter, %d frontends(%d sim) and %d demux",
-		m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size());
+	int fd = open("/proc/stb/info/model", O_RDONLY);
+	char tmp[255];
+	int rd = fd >= 0 ? read(fd, tmp, 255) : 0;
+	if (fd >= 0)
+		close(fd);
+
+	if (!strncmp(tmp, "dm7025\n", rd))
+		m_boxtype = DM7025;
+	else if (!strncmp(tmp, "dm8000\n", rd))
+		m_boxtype = DM8000;
+	else if (!strncmp(tmp, "dm800\n", rd))
+		m_boxtype = DM800;
+	else if (!strncmp(tmp, "dm500hd\n", rd))
+		m_boxtype = DM500HD;
+	else {
+		eDebug("boxtype detection via /proc/stb/info not possible... use fallback via demux count!\n");
+		if (m_demux.size() == 3)
+			m_boxtype = DM800;
+		else if (m_demux.size() < 5)
+			m_boxtype = DM7025;
+		else
+			m_boxtype = DM8000;
+	}
+
+	eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d",
+		m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype);
 
 	eDVBCAService::registerChannelCallback(this);
 
@@ -429,7 +453,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 
 	ePtr<eDVBRegisteredDemux> unused;
 
-	if (m_demux.size() == 3) // dm800 / 500hd
+	if (m_boxtype == DM800 || m_boxtype == DM500HD) // dm800 / 500hd
 	{
 		for (; i != m_demux.end(); ++i, ++n)
 		{
@@ -438,16 +462,26 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 				if (!unused)
 					unused = i;
 			}
-			else if (!fe || (i->m_adapter == fe->m_adapter &&
-			    i->m_demux->getSource() == fe->m_frontend->getDVBID()))
+			else
 			{
-				demux = new eDVBAllocatedDemux(i);
-				return 0;
+				if (fe)
+				{
+					if (i->m_adapter == fe->m_adapter && 
+					    i->m_demux->getSource() == fe->m_frontend->getDVBID())
+					{
+						demux = new eDVBAllocatedDemux(i);
+						return 0;
+					}
+				}
+				else if (i->m_demux->getSource() == -1) // PVR
+				{
+					demux = new eDVBAllocatedDemux(i);
+					return 0;
+				}
 			}
 		}
-	
 	}
-	else if (m_demux.size() < 5) // ATI
+	else if (m_boxtype == DM7025) // ATI
 	{
 		/* FIXME: hardware demux policy */
 		if (!(cap & iDVBChannel::capDecode))
@@ -474,7 +508,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else // we asume dm8000
+	else if (m_boxtype == DM8000)
 	{
 		for (; i != m_demux.end(); ++i, ++n)
 		{