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
old mode 100644 (file)
new mode 100755 (executable)
index d165e26..18616bf
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -44,8 +44,8 @@ class Harddisk:
                        self.timer.callback.remove(self.runIdle)
 
        def bus(self):
-               ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific
-               internal = self.device.find("hd") == 0
+               ide_cf = self.device[:2] == "hd" and "host0" not in self.devidex2 # 7025 specific
+               internal = self.device[:2] == "hd"
                if ide_cf:
                        ret = "External (CF)"
                elif internal:
@@ -70,17 +70,17 @@ 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.find("hd") == 0:
+               if self.device[:2] == "hd":
                        procfile = tryOpen("/proc/ide/"+self.device+"/model")
                        if procfile == "":
                                return ""
                        line = procfile.readline()
                        procfile.close()
                        return line.strip()
-               elif self.device.find("sd") == 0:
+               elif self.device[:2] == "sd":
                        procfile = tryOpen("/sys/block/"+self.device+"/device/vendor")
                        if procfile == "":
                                return ""
@@ -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:
@@ -230,9 +236,8 @@ class Harddisk:
        # we set the hdd into standby.
        def readStats(self):
                l = open("/sys/block/%s/stat" % self.device).read()
-               nr_read = int(l[:8].strip())
-               nr_write = int(l[4*9:4*9+8].strip())
-               return nr_read, nr_write
+               (nr_read, _, _, _, nr_write) = l.split()[:5]
+               return int(nr_read), int(nr_write)
 
        def startIdle(self):
                self.last_access = time.time()
@@ -324,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:
@@ -358,8 +377,7 @@ class HarddiskManager:
                                        ("/", _("Internal Flash"))
                                ]
                
-               for x in p:
-                       self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
+               self.partitions.extend([ Partition(mountpoint = x[0], description = x[1]) for x in p ])
 
        def getBlockDevInfo(self, blockdev):
                devpath = "/sys/block/" + blockdev
@@ -371,14 +389,14 @@ class HarddiskManager:
                try:
                        removable = bool(int(open(devpath + "/removable").read()))
                        dev = int(open(devpath + "/dev").read().split(':')[0])
-                       if dev in [7, 31]: # loop, mtdblock
+                       if dev in (7, 31): # loop, mtdblock
                                blacklisted = True
                        if blockdev[0:2] == 'sr':
                                is_cdrom = True
                        if blockdev[0:2] == 'hd':
                                try:
                                        media = open("/proc/ide/%s/media" % blockdev).read()
-                                       if media.find("cdrom") != -1:
+                                       if "cdrom" in media:
                                                is_cdrom = True
                                except IOError:
                                        error = True
@@ -457,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
 
@@ -510,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
 
@@ -519,4 +537,18 @@ class HarddiskManager:
                        description += " (Partition %d)" % part
                return description
 
+       def addMountedPartition(self, device, desc):
+               already_mounted = False
+               for x in self.partitions[:]:
+                       if x.mountpoint == device:
+                               already_mounted = True
+               if not already_mounted:
+                       self.partitions.append(Partition(mountpoint = device, description = desc))
+               
+       def removeMountedPartition(self, mountpoint):
+               for x in self.partitions[:]:
+                       if x.mountpoint == mountpoint:
+                               self.partitions.remove(x)
+                               self.on_partition_list_change("remove", x)
+
 harddiskmanager = HarddiskManager()