diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-06-06 00:03:39 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-06-06 00:03:39 +0000 |
| commit | b2eebd0fef155a40a8a74468c4488cfb0c656a9a (patch) | |
| tree | 084b9876b33d54e838b1b9a964c8f63140537504 /lib/python | |
| parent | 139ac47d708f47aed50c8863193c109739bfa93e (diff) | |
| download | enigma2-b2eebd0fef155a40a8a74468c4488cfb0c656a9a.tar.gz enigma2-b2eebd0fef155a40a8a74468c4488cfb0c656a9a.zip | |
some fixes for empty tuner slots (use slotid instead of dvb api frontend
device id)
replace some hacks with some better hacks ;)
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 10 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index e5c56424..bcdd9440 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -4,7 +4,8 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteLNBParameters as lnbParam, \ eDVBSatelliteDiseqcParameters as diseqcParam, \ eDVBSatelliteSwitchParameters as switchParam, \ - eDVBSatelliteRotorParameters as rotorParam + eDVBSatelliteRotorParameters as rotorParam, \ + eDVBResourceManager import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE @@ -732,12 +733,17 @@ def InitNimManager(nimmgr): for x in range(len(nimmgr.nim_slots)): config.Nims.append(ConfigSubsection()) + used_nim_slots = [ ] + for slot in nimmgr.nim_slots: x = slot.slot nim = config.Nims[x] # HACK: currently, we can only looptrough to socket A + if slot.type is not None: + used_nim_slots.append((slot.slot, slot.description)) + if slot.isCompatible("DVB-S"): if slot.slot == 0: nim.configMode = ConfigSelection( @@ -926,6 +932,8 @@ def InitNimManager(nimmgr): print "pls add support for this frontend type!" # assert False + eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots) + nimmgr.sec = SecConfigure(nimmgr) nimmanager = NimManager() diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 4b2f309d..9980df53 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -205,9 +205,10 @@ class CableTransponderSearchSupport: self.cable_search_container.dataAvail.get().append(self.getCableTransponderData) cableConfig = config.Nims[nim_idx].cable cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus " + #FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000 if nim_idx < 2: cmd += str(nim_idx) - else: # FIXMEE DM8000 + else: if nim_idx == 2: cmd += "2" # first nim socket on DM8000 use /dev/i2c/2 else: |