From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 4 Jun 2009 20:23:53 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=e26b2adba2dad6e9c25196d841657d31e4f21046;hp=f4e60c14b94fe0155aba9addc908a0b2860b3cd8

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index d30be29..e6d9a25 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)
 		{
@@ -457,7 +481,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 			}
 		}
 	}
-	else if (m_demux.size() < 5) // ATI
+	else if (m_boxtype == DM7025) // ATI
 	{
 		/* FIXME: hardware demux policy */
 		if (!(cap & iDVBChannel::capDecode))
@@ -484,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)
 		{
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 5399f45..413462d 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -135,6 +135,10 @@ class eDVBResourceManager: public iObject, public Object
 	DECLARE_REF(eDVBResourceManager);
 	int avail, busy;
 
+	enum { DM7025, DM800, DM500HD, DM8000 };
+
+	int m_boxtype;
+
 	eSmartPtrList<iDVBAdapter> m_adapter;
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
 	eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;