diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-10-06 09:43:35 +0200 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-10-06 09:43:35 +0200 |
| commit | fe72b7929c2f0b5dbac3040b303d195923735fc8 (patch) | |
| tree | 6234f695e635e88d448993243ce0b01caf58efbb /lib | |
| parent | 0edde94c71828b4cbb95bbfb7011b6b966562742 (diff) | |
| download | enigma2-fe72b7929c2f0b5dbac3040b303d195923735fc8.tar.gz enigma2-fe72b7929c2f0b5dbac3040b303d195923735fc8.zip | |
fixes bug #593
use i2c_device from /proc/bus/nim_sockets for automatic cable scan
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Components/NimManager.py | 3 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 21 |
2 files changed, 11 insertions, 13 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f934ed50..67a1abc8 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -769,6 +769,9 @@ class NimManager: def getNim(self, slotid): return self.nim_slots[slotid] + + def getI2CDevice(self, slotid): + return self.nim_slots[slotid].getI2C() def getNimListOfType(self, type, exception = -1): # returns a list of indexes for NIMs compatible to the given type, except for 'exception' diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index f4828088..2e2f8364 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -192,21 +192,16 @@ class CableTransponderSearchSupport: self.cable_search_container.dataAvail.append(self.getCableTransponderData) cableConfig = config.Nims[nim_idx].cable tunername = nimmanager.getNimName(nim_idx) + bus = nimmanager.getI2CDevice(nim_idx) + if bus is None: + print "ERROR: could not get I2C device for nim", nim_idx, "for cable transponder search" + bus = 2 + if tunername == "CXD1981": - cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus " - else: - cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus " - #FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000 - if nim_idx < 2: - if HardwareInfo().get_device_name() == "dm500hd": - cmd += "2" - else: - cmd += str(nim_idx) + cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus %d" % bus else: - if nim_idx == 2: - cmd += "2" # first nim socket on DM8000 use /dev/i2c/2 - else: - cmd += "4" # second nim socket on DM8000 use /dev/i2c/4 + cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus %d" % bus + if cableConfig.scan_type.value == "bands": cmd += " --scan-bands " bands = 0 |