X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3f60b3adf25d27c908f6e0db7e3cd71e84b9779c..1736046db88e13842e67396da8ee7b02ece75443:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index ad6c1a3b..18616bf2 100755
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -70,7 +70,7 @@ class Harddisk:
 		cap = self.diskSize()
 		if cap == 0:
 			return ""
-		return "%d.%03d GB" % (cap/1024, cap%1024)
+		return "%d.%03d GB" % (cap/1000, cap%1000)
 
 	def model(self):
 		if self.device[:2] == "hd":
@@ -156,14 +156,20 @@ class Harddisk:
 		cmd = "/sbin/mkfs.ext3 "
 		if self.diskSize() > 4 * 1024:
 			cmd += "-T largefile "
-		cmd += "-m0 " + self.devidex + "part1"
+		cmd += "-m0 -O dir_index " + self.devidex + "part1"
 		res = system(cmd)
 		return (res >> 8)
 
 	def mount(self):
-		cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
-		res = system(cmd)
-		return (res >> 8)
+		res = -1
+		#we don't know which type of devicename is used in fstab, try both
+		for device in [self.devidex, self.devidex2]:
+			cmd = "/bin/mount -t ext3 " + device + "part1"
+			res = system(cmd)
+			res >>= 8
+			if not res:
+				break
+		return res
 
 	def createMovieFolder(self):
 		try:
@@ -323,12 +329,26 @@ class Partition:
 		return False
 
 DEVICEDB =  \
+	{"dm8000":
+		{
+			# dm8000:
+			"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot",
+			"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot",
+			"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot",
+			"/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive",
+		},
+	"dm800":
 	{
-		# dm8000:
-		"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot",
-		"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot",
-		"/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot",
-		"/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive",
+		# dm800:
+		"/devices/platform/brcm-ehci.0/usb1/1-2/1-2:1.0": "Upper USB Slot",
+		"/devices/platform/brcm-ehci.0/usb1/1-1/1-1:1.0": "Lower USB Slot",
+	},
+	"dm7025":
+	{
+		# dm7025:
+		"/devices/pci0000:00/0000:00:14.1/ide1/1.0": "CF Card Slot", #hdc
+		"/devices/pci0000:00/0000:00:14.1/ide0/0.0": "Internal Harddisk"
+	}
 	}
 
 class HarddiskManager:
@@ -507,7 +527,8 @@ class HarddiskManager:
 			description = open("/sys" + phys + "/model").read().strip()
 		except IOError, s:
 			print "couldn't read model: ", s
-		for physdevprefix, pdescription in DEVICEDB.items():
+		from Tools.HardwareInfo import HardwareInfo
+		for physdevprefix, pdescription in DEVICEDB.get(HardwareInfo().device_name,{}).items():
 			if phys.startswith(physdevprefix):
 				description = pdescription