Attachment 301486 Details for Bug 416821 – the changes made in the previous attachment as a patch

[patch] the changes made in the previous attachment as a patch

system-config-network.patch (text/plain), 3.46 KB, created by Paul Bolle on 2008-04-07 09:19:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Bolle

Created: 2008-04-07 09:19:33 UTC

Size: 3.46 KB

patch

obsolete

>diff -bup system-config-network-1.4.7/src/netconfpkg/NCisdnhardware.py.oud system-config-network-1.4.7/src/netconfpkg/NCisdnhardware.py
>--- system-config-network-1.4.7/src/netconfpkg/NCisdnhardware.py.oud	2007-10-26 11:32:47.000000000 +0200
>+++ system-config-network-1.4.7/src/netconfpkg/NCisdnhardware.py	2008-01-19 19:38:25.000000000 +0100
>@@ -90,6 +90,10 @@ __card = {
>     "W6692 based PCI cards" : [ "36", "", "", "", "", "", "1050", "6692", "HiSax", "", "hisax" ]
>     }
> 
>+def get_cardlist():
>+    global __card
>+    return __card
>+
> 
> class ConfISDN:
>     keydict = { 'Description' : 'NAME',
>@@ -239,29 +243,34 @@ class ConfISDN:
> 
>         if found == 0: return
> 
>-        for i in __card.keys():
>-            if __card[i][VENDOR_ID] and __card[i][DEVICE_ID]:
>-                if string.find(pci_infos, __card[i][VENDOR_ID] + ':' + __card[i][DEVICE_ID]) >0:
>-                    return {i : __card[i]}
>-                elif idl and idl.count(__card[i][VENDOR_ID] + __card[i][DEVICE_ID]) >0:
>-                    return {i : __card[i]}
>+	cardlist = get_cardlist()
>+
>+        for i in cardlist.keys():
>+            if cardlist[i][VENDOR_ID] and cardlist[i][DEVICE_ID]:
>+                if string.find(pci_infos, cardlist[i][VENDOR_ID] + ':' + cardlist[i][DEVICE_ID]) >0:
>+                    return {i : cardlist[i]}
>+                elif idl and idl.count(cardlist[i][VENDOR_ID] + cardlist[i][DEVICE_ID]) >0:
>+                    return {i : cardlist[i]}
> 
>     def get_resource(self, name):
>         global __card
>-        if __card.has_key(name):
>+	cardlist = get_cardlist()
>+
>+        #if __card.has_key(name):
>+        if cardlist.has_key(name):
> 			# FIXME: remove Cardinfo
>             self.Description = name
>-            self.Type = __card[name][TYPE]
>-            self.IRQ = __card[name][IRQ]
>-            self.IoPort = __card[name][IO]
>-            self.IoPort1 = __card[name][IO1]
>-            self.IoPort2 = __card[name][IO2]
>-            self.Mem = __card[name][MEM]
>-            self.VendorId = __card[name][VENDOR_ID]
>-            self.DeviceId = __card[name][DEVICE_ID]
>-            self.DriverId = __card[name][DRIVER_ID]
>-            self.Firmware = __card[name][FIRMWARE]
>-            self.ModuleName = __card[name][MODUL]
>+            self.Type = cardlist[name][TYPE]
>+            self.IRQ = cardlist[name][IRQ]
>+            self.IoPort = cardlist[name][IO]
>+            self.IoPort1 = cardlist[name][IO1]
>+            self.IoPort2 = cardlist[name][IO2]
>+            self.Mem = cardlist[name][MEM]
>+            self.VendorId = cardlist[name][VENDOR_ID]
>+            self.DeviceId = cardlist[name][DEVICE_ID]
>+            self.DriverId = cardlist[name][DRIVER_ID]
>+            self.Firmware = cardlist[name][FIRMWARE]
>+            self.ModuleName = cardlist[name][MODUL]
> 
> 
> if __name__ == "__main__":
>diff -bup system-config-network-1.4.7/src/netconfpkg/gui/IsdnInterface.py.oud system-config-network-1.4.7/src/netconfpkg/gui/IsdnInterface.py
>--- system-config-network-1.4.7/src/netconfpkg/gui/IsdnInterface.py.oud	2007-10-24 15:29:46.000000000 +0200
>+++ system-config-network-1.4.7/src/netconfpkg/gui/IsdnInterface.py	2008-01-19 19:36:00.000000000 +0100
>@@ -159,7 +159,8 @@ class IsdnInterface:
>             self.xml.get_widget("io2Entry").set_sensitive(False)
> 
>     def setup(self):
>-        cardlist = NCisdnhardware.card.keys()
>+	cardlist = NCisdnhardware.get_cardlist()
>+	cardlist = cardlist.keys()
>         cardlist.sort()
>         self.xml.get_widget("isdnCardComboBox").set_popdown_strings(cardlist)
>

Actions: View | Diff

Attachments on bug 416821: 292270 | 301486 | 301951