[Asterisk-cvs] zaptel pciradio.c, 1.18, 1.19 tor2.c, 1.26, 1.27 wcfxo.c, 1.30, 1.31 wct1xxp.c, 1.24, 1.25 wct4xxp.c, 1.91, 1.92 wctdm.c, 1.126, 1.127 wcte11xp.c, 1.14, 1.15 zaptel.h, 1.49, 1.50

[kpfleming]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv1732

Modified Files:
        pciradio.c tor2.c wcfxo.c wct1xxp.c wct4xxp.c wctdm.c 
        wcte11xp.c zaptel.h 
Log Message:
use pci_register_driver() on recent kernels (issue #5375, compatibility fix 
only, no functional difference)


Index: pciradio.c
===================================================================
RCS file: /usr/cvsroot/zaptel/pciradio.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pciradio.c  8 Sep 2005 17:22:39 -0000       1.18
+++ pciradio.c  4 Oct 2005 23:08:49 -0000       1.19
@@ -1796,7 +1796,7 @@
 {
        int res;
 
-       res = pci_module_init(&pciradio_driver);
+       res = zap_pci_module(&pciradio_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- tor2.c      31 Aug 2005 21:41:37 -0000      1.26
+++ tor2.c      4 Oct 2005 23:08:49 -0000       1.27
@@ -647,7 +647,7 @@
 
 static int __init tor2_init(void) {
        int res;
-       res = pci_module_init(&tor2_driver);
+       res = zap_pci_module(&tor2_driver);
        printk("Registered Tormenta2 PCI\n");
        return res;
 }

Index: wcfxo.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- wcfxo.c     15 Jan 2005 22:59:18 -0000      1.30
+++ wcfxo.c     4 Oct 2005 23:08:49 -0000       1.31
@@ -1006,7 +1006,7 @@
                        printk("%d: %s\n", x, fxo_modes[x].name);
                return -ENODEV;
        }
-       res = pci_module_init(&wcfxo_driver);
+       res = zap_pci_module(&wcfxo_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- wct1xxp.c   25 Jul 2005 18:30:55 -0000      1.24
+++ wct1xxp.c   4 Oct 2005 23:08:49 -0000       1.25
@@ -1390,7 +1390,7 @@
 static int __init t1xxp_init(void)
 {
        int res;
-       res = pci_module_init(&t1xxp_driver);
+       res = zap_pci_module(&t1xxp_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- wct4xxp.c   29 Sep 2005 14:00:57 -0000      1.91
+++ wct4xxp.c   4 Oct 2005 23:08:49 -0000       1.92
@@ -2935,7 +2935,7 @@
 static int __init t4_init(void)
 {
        int res;
-       res = pci_module_init(&t4_driver);
+       res = zap_pci_module(&t4_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: wctdm.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wctdm.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- wctdm.c     26 Sep 2005 20:11:36 -0000      1.126
+++ wctdm.c     4 Oct 2005 23:08:49 -0000       1.127
@@ -2357,7 +2357,7 @@
                return -ENODEV;
        }
 
-       res = pci_module_init(&wctdm_driver);
+       res = zap_pci_module(&wctdm_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- wcte11xp.c  4 Aug 2005 19:50:05 -0000       1.14
+++ wcte11xp.c  4 Oct 2005 23:08:49 -0000       1.15
@@ -1565,7 +1565,7 @@
 static int __init t1xxp_init(void)
 {
        int res;
-       res = pci_module_init(&t1xxp_driver);
+       res = zap_pci_module(&t1xxp_driver);
        if (res)
                return -ENODEV;
        return 0;

Index: zaptel.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- zaptel.h    30 Sep 2005 20:41:21 -0000      1.49
+++ zaptel.h    4 Oct 2005 23:08:49 -0000       1.50
@@ -48,6 +48,12 @@
 #define LINUX26
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
+#define zap_pci_module pci_register_driver
+#else
+#define zap_pci_module pci_module_init
+#endif
+
 #include "ecdis.h"
 #include "fasthdlc.h"
 #endif

_______________________________________________
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs