make DEVICEDB depending on model type

[enigma2.git] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 37905b7d70ee03f5af70dfc5d9babc3a82010cb5..18616bf28a6d7872a0ac6b808a4976e82d9a9d4c 100755 (executable)
--- 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:
@@ -455,11 +475,10 @@ class HarddiskManager:
                                self.on_partition_list_change("remove", x)
                l = len(device)
                if l and not device[l-1].isdigit():
-                       idx = 0
                        for hdd in self.hdd:
                                if hdd.device == device:
-                                       self.hdd[x].stop()
-                                       del self.hdd[idx]
+                                       hdd.stop()
+                                       self.hdd.remove(hdd)
                                        break
                        SystemInfo["Harddisk"] = len(self.hdd) > 0
 
@@ -508,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