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

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

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 8664f79a48b7cc6a980122d4a04faf3a1699f5ff..0d1412481b12404eb485447ca6e7d60ad355e493 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:
@@ -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()
@@ -330,6 +335,12 @@ DEVICEDB =  \
                "/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:
+               "/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:
@@ -456,11 +467,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