Merge branch 'master' of 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 c34511db7f6771efb6e6148fd67c48f37d62f0c8..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":
@@ -335,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: