From: Felix Domke <tmbinc@elitedvb.net>
Date: Tue, 9 Jun 2009 00:34:47 +0000 (+0200)
Subject: statially store detected hardware type; it's unlikely to change at runtime
X-Git-Tag: 2.6.0~258
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/bdd9e446243db1603e5ab6018ecbed3d4c8a59bd?hp=1d8153e23d1cd08c83a784a5b3a00cb4b6ee33f1;ds=sidebyside

statially store detected hardware type; it's unlikely to change at runtime
---

diff --git a/lib/python/Tools/HardwareInfo.py b/lib/python/Tools/HardwareInfo.py
index 9fb17dac..612a565f 100644
--- a/lib/python/Tools/HardwareInfo.py
+++ b/lib/python/Tools/HardwareInfo.py
@@ -1,9 +1,15 @@
 class HardwareInfo:
+	device_name = None
+
 	def __init__(self):
-		self.device = "unknown"
+		if HardwareInfo.device_name is not None:
+			print "using cached result"
+			return
+
+		HardwareInfo.device_name = "unknown"
 		try:
 			file = open("/proc/stb/info/model", "r")
-			self.device = file.readline().strip()
+			HardwareInfo.device_name = file.readline().strip()
 			file.close()
 		except:
 			print "----------------"
@@ -13,19 +19,16 @@ class HardwareInfo:
 			try:
 				rd = open("/proc/cpuinfo", "r").read()
 				if rd.find("Brcm4380 V4.2") != -1:
-					self.device = "dm8000"
+					HardwareInfo.device_name = "dm8000"
 					print "dm8000 detected!"
 				elif rd.find("Brcm7401 V0.0") != -1:
-					self.device = "dm800"
+					HardwareInfo.device_name = "dm800"
 					print "dm800 detected!"
 				elif rd.find("MIPS 4KEc V4.8") != -1:
-					self.device = "dm7025"
+					HardwareInfo.device_name = "dm7025"
 					print "dm7025 detected!"
 			except:
 				pass
 
 	def get_device_name(self):
-		return self.device
-	
-	device_name = property(get_device_name)
-
+		return HardwareInfo.device_name