diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-10 12:50:53 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-10 14:23:43 +0200 |
| commit | eca7d386b015423112c83badcdb3e4f7e6affe6e (patch) | |
| tree | 9309ba240c13d8f5d5bff5120b48a9c501aff741 /lib/python/Screens | |
| parent | aed83aaddeb4782046a204d7a6884c3a9bdf47a3 (diff) | |
| parent | fe72b7929c2f0b5dbac3040b303d195923735fc8 (diff) | |
| download | enigma2-eca7d386b015423112c83badcdb3e4f7e6affe6e.tar.gz enigma2-eca7d386b015423112c83badcdb3e4f7e6affe6e.zip | |
Merge remote branch 'origin/bug_593_i2c_device_from_file' into experimental
this merge and bug 587 needs new drivers!!
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 21 |
1 files changed, 8 insertions, 13 deletions
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 |