[Asterisk-cvs] zaptel ChangeLog, 1.1.2.17, 1.1.2.18 tor2.c, 1.19.2.5, 1.19.2.6 wcfxo.c, 1.25.2.4, 1.25.2.5 wcfxs.c, 1.84.2.16, 1.84.2.17 wct1xxp.c, 1.19.2.5, 1.19.2.6 wcte11xp.c, 1.1.2.11, 1.1.2.12 zaptel.h, 1.38.2.1, 1.38.2.2

[kpfleming]

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

Modified Files:
      Tag: v1-0
	ChangeLog tor2.c wcfxo.c wcfxs.c wct1xxp.c wcte11xp.c zaptel.h 
Log Message:
port API call update from HEAD


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/zaptel/ChangeLog,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- ChangeLog	8 Nov 2005 16:01:12 -0000	1.1.2.17
+++ ChangeLog	15 Nov 2005 14:28:44 -0000	1.1.2.18
@@ -1,4 +1,5 @@
  -- support DACS w/RBS on single-span cards
+ -- use newer API call on 2.6.10+ kernels
 zaptel 1.0.9.2
  -- fix build issues for Linux 2.6.13 
  -- fixed tor2 to work on 64-bit architectures

Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -d -r1.19.2.5 -r1.19.2.6
--- tor2.c	31 Aug 2005 21:43:39 -0000	1.19.2.5
+++ tor2.c	15 Nov 2005 14:28:44 -0000	1.19.2.6
@@ -628,7 +628,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.25.2.4
retrieving revision 1.25.2.5
diff -u -d -r1.25.2.4 -r1.25.2.5
--- wcfxo.c	31 Oct 2005 18:53:47 -0000	1.25.2.4
+++ wcfxo.c	15 Nov 2005 14:28:44 -0000	1.25.2.5
@@ -1007,7 +1007,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: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/Attic/wcfxs.c,v
retrieving revision 1.84.2.16
retrieving revision 1.84.2.17
diff -u -d -r1.84.2.16 -r1.84.2.17
--- wcfxs.c	4 Nov 2005 04:53:57 -0000	1.84.2.16
+++ wcfxs.c	15 Nov 2005 14:28:44 -0000	1.84.2.17
@@ -2206,7 +2206,7 @@
 		return -ENODEV;
 	}
 
-	res = pci_module_init(&wcfxs_driver);
+	res = zap_pci_module(&wcfxs_driver);
 	if (res)
 		return -ENODEV;
 	return 0;

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -d -r1.19.2.5 -r1.19.2.6
--- wct1xxp.c	8 Nov 2005 16:00:44 -0000	1.19.2.5
+++ wct1xxp.c	15 Nov 2005 14:28:44 -0000	1.19.2.6
@@ -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: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- wcte11xp.c	8 Nov 2005 16:00:44 -0000	1.1.2.11
+++ wcte11xp.c	15 Nov 2005 14:28:44 -0000	1.1.2.12
@@ -1554,7 +1554,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.38.2.1
retrieving revision 1.38.2.2
diff -u -d -r1.38.2.1 -r1.38.2.2
--- zaptel.h	15 Jun 2005 21:31:22 -0000	1.38.2.1
+++ zaptel.h	15 Nov 2005 14:28:44 -0000	1.38.2.2
@@ -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