aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-10-26 15:05:06 +0300
committerTimo Teräs <timo.teras@iki.fi>2010-10-26 15:05:45 +0300
commit7cd9efdbe3159245205d4055ab801b3d0d4e23f8 (patch)
treed0dced343d3d8621c952d5cc032a5eee26655c87
parent153c38dde26bbbac83b42b7b367c2e17c1cab7bc (diff)
downloadalpine_aports-7cd9efdbe3159245205d4055ab801b3d0d4e23f8.tar.bz2
alpine_aports-7cd9efdbe3159245205d4055ab801b3d0d4e23f8.tar.xz
alpine_aports-7cd9efdbe3159245205d4055ab801b3d0d4e23f8.zip
main/dahdi-linux-vserver: update to 2.4.0
and update zaphfc to compile with new dahdi
Diffstat
-rw-r--r--main/dahdi-linux-vserver/APKBUILD12
-rw-r--r--main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch27
-rw-r--r--main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch100
-rw-r--r--main/dahdi-linux-vserver/dahdi-zaphfc2.patch12
-rw-r--r--main/dahdi-linux-vserver/zaphfc-dahdi-2.4.0.patch58
5 files changed, 63 insertions, 146 deletions
diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index 2fc54cb202..5bb6d4fa12 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -16,8 +16,8 @@ _realname=dahdi-linux
16pkgname=${_realname}-${_flavor} 16pkgname=${_realname}-${_flavor}
17pkgver=$pkgver 17pkgver=$pkgver
18# when bumping _dahdiver we *must* bump _mypkgrel 18# when bumping _dahdiver we *must* bump _mypkgrel
19_dahdiver=2.3.0.1 19_dahdiver=2.4.0
20_mypkgrel=4 20_mypkgrel=0
21pkgrel=$(( $_kpkgrel + $_mypkgrel )) 21pkgrel=$(( $_kpkgrel + $_mypkgrel ))
22pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" 22pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver"
23url="http://www.asterisk.org" 23url="http://www.asterisk.org"
@@ -32,9 +32,8 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna
32 dahdi-depmod.patch 32 dahdi-depmod.patch
33 dahdi-bri_dchan.patch 33 dahdi-bri_dchan.patch
34 dahdi-zaphfc.patch 34 dahdi-zaphfc.patch
35 dahdi-zaphfc2.patch
36 zaphfc-dahdi-flortz.diff 35 zaphfc-dahdi-flortz.diff
37 dahdi-2.2.0.2-gcc44-hack.patch 36 zaphfc-dahdi-2.4.0.patch
38 " 37 "
39 38
40prepare() { 39prepare() {
@@ -74,10 +73,9 @@ dev() {
74 ln -s /usr/include "$dir"/include 73 ln -s /usr/include "$dir"/include
75} 74}
76 75
77md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz 76md5sums="0114826395f76713486142b90d772f82 dahdi-linux-2.4.0.tar.gz
78c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 77c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch
794b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch 784b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch
803be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch 793be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch
81854008afc44b7a5c920f4ae4a2860e3b dahdi-zaphfc2.patch
82291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff 80291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff
83eeb4b2870d23d7c020cd99b5b1a633e9 dahdi-2.2.0.2-gcc44-hack.patch" 810fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch"
diff --git a/main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch
deleted file mode 100644
index d647a1f9be..0000000000
--- a/main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xpp_dahdi.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xpp_dahdi.c
2--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xpp_dahdi.c 2009-10-22 18:52:23.000000000 +0100
3+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xpp_dahdi.c 2009-10-22 18:52:55.000000000 +0100
4@@ -865,9 +865,11 @@
5 #endif
6 spin_lock_irqsave(&xbus->lock, flags);
7 atomic_inc(&xpd->open_counter);
8+/*
9 LINE_DBG(DEVICES, xpd, pos, "%s[%d]: open_counter=%d\n",
10 current->comm, current->pid,
11 atomic_read(&xpd->open_counter));
12+*/
13 spin_unlock_irqrestore(&xbus->lock, flags);
14 if(xpd->xops->card_open)
15 xpd->xops->card_open(xpd, pos);
16@@ -885,9 +887,11 @@
17 spin_unlock_irqrestore(&xbus->lock, flags);
18 if(xpd->xops->card_close)
19 xpd->xops->card_close(xpd, pos);
20+/*
21 LINE_DBG(DEVICES, xpd, pos, "%s[%d]: open_counter=%d\n",
22 current->comm, current->pid,
23 atomic_read(&xpd->open_counter));
24+*/
25 atomic_dec(&xpd->open_counter); /* from xpp_open() */
26 put_xpd(__FUNCTION__, xpd); /* from xpp_open() */
27 return 0;
diff --git a/main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch
deleted file mode 100644
index 5451bc6915..0000000000
--- a/main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/dahdi-base.c dahdi-linux-2.2.0.2/drivers/dahdi/dahdi-base.c
2--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/dahdi-base.c 2009-10-22 17:14:40.000000000 +0100
3+++ dahdi-linux-2.2.0.2/drivers/dahdi/dahdi-base.c 2009-10-22 17:14:49.000000000 +0100
4@@ -46,6 +46,7 @@
5 #include <linux/kmod.h>
6 #include <linux/moduleparam.h>
7 #include <linux/list.h>
8+#include <linux/sched.h>
9
10 #include <linux/ppp_defs.h>
11
12diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/pciradio.c dahdi-linux-2.2.0.2/drivers/dahdi/pciradio.c
13--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/pciradio.c 2009-10-22 17:14:40.000000000 +0100
14+++ dahdi-linux-2.2.0.2/drivers/dahdi/pciradio.c 2009-10-22 17:14:49.000000000 +0100
15@@ -51,6 +51,7 @@
16 #include <linux/pci.h>
17 #include <linux/interrupt.h>
18 #include <linux/moduleparam.h>
19+#include <linux/sched.h>
20 #include <asm/io.h>
21 #include <asm/delay.h>
22
23diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/voicebus/voicebus.c dahdi-linux-2.2.0.2/drivers/dahdi/voicebus/voicebus.c
24--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/voicebus/voicebus.c 2009-10-22 17:14:40.000000000 +0100
25+++ dahdi-linux-2.2.0.2/drivers/dahdi/voicebus/voicebus.c 2009-10-22 17:16:44.000000000 +0100
26@@ -35,6 +35,7 @@
27 #include <linux/interrupt.h>
28 #include <linux/timer.h>
29 #include <linux/module.h>
30+#include <linux/sched.h>
31
32 #include <dahdi/kernel.h>
33 #include "voicebus.h"
34diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcfxo.c dahdi-linux-2.2.0.2/drivers/dahdi/wcfxo.c
35--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcfxo.c 2009-10-22 17:14:40.000000000 +0100
36+++ dahdi-linux-2.2.0.2/drivers/dahdi/wcfxo.c 2009-10-22 17:14:49.000000000 +0100
37@@ -30,6 +30,7 @@
38 #include <linux/usb.h>
39 #include <linux/errno.h>
40 #include <linux/pci.h>
41+#include <linux/sched.h>
42 #include <asm/io.h>
43 #include <linux/moduleparam.h>
44
45diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wct1xxp.c dahdi-linux-2.2.0.2/drivers/dahdi/wct1xxp.c
46--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wct1xxp.c 2009-10-22 17:14:40.000000000 +0100
47+++ dahdi-linux-2.2.0.2/drivers/dahdi/wct1xxp.c 2009-10-22 17:14:49.000000000 +0100
48@@ -33,6 +33,7 @@
49 #include <linux/pci.h>
50 #include <linux/spinlock.h>
51 #include <linux/moduleparam.h>
52+#include <linux/sched.h>
53
54 #include <dahdi/kernel.h>
55
56diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm24xxp/base.c dahdi-linux-2.2.0.2/drivers/dahdi/wctdm24xxp/base.c
57--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm24xxp/base.c 2009-10-22 17:14:40.000000000 +0100
58+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctdm24xxp/base.c 2009-10-22 17:14:49.000000000 +0100
59@@ -45,6 +45,7 @@
60 #include <linux/workqueue.h>
61 #include <linux/delay.h>
62 #include <linux/moduleparam.h>
63+#include <linux/sched.h>
64 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
65 #include <linux/semaphore.h>
66 #else
67diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm.c dahdi-linux-2.2.0.2/drivers/dahdi/wctdm.c
68--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm.c 2009-10-22 17:14:40.000000000 +0100
69+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctdm.c 2009-10-22 17:14:49.000000000 +0100
70@@ -31,6 +31,8 @@
71 #include <linux/pci.h>
72 #include <linux/interrupt.h>
73 #include <linux/moduleparam.h>
74+#include <linux/sched.h>
75+
76 #include <asm/io.h>
77 #include "proslic.h"
78
79diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcte11xp.c dahdi-linux-2.2.0.2/drivers/dahdi/wcte11xp.c
80--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcte11xp.c 2009-10-22 17:14:40.000000000 +0100
81+++ dahdi-linux-2.2.0.2/drivers/dahdi/wcte11xp.c 2009-10-22 17:14:49.000000000 +0100
82@@ -32,6 +32,7 @@
83 #include <linux/pci.h>
84 #include <linux/spinlock.h>
85 #include <linux/moduleparam.h>
86+#include <linux/sched.h>
87
88 #include <dahdi/kernel.h>
89
90diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xbus-core.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-core.c
91--- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xbus-core.c 2009-10-22 17:14:40.000000000 +0100
92+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-core.c 2009-10-22 17:16:10.000000000 +0100
93@@ -35,6 +35,7 @@
94 #include <linux/workqueue.h>
95 #include <linux/device.h>
96 #include <linux/delay.h> /* for msleep() to debug */
97+#include <linux/sched.h>
98 #include "xpd.h"
99 #include "xpp_dahdi.h"
100 #include "xbus-core.h"
diff --git a/main/dahdi-linux-vserver/dahdi-zaphfc2.patch b/main/dahdi-linux-vserver/dahdi-zaphfc2.patch
deleted file mode 100644
index 33ebafd990..0000000000
--- a/main/dahdi-linux-vserver/dahdi-zaphfc2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c
2 ===================================================================
3 --- dahdi-linux-2.3.0.1.orig/drivers/dahdi/zaphfc.c 2010-08-19 14:50:10.000000000 +0300
4 +++ dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c 2010-08-19 14:50:44.000000000 +0300
5 @@ -676,6 +676,7 @@
6 sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1);
7 }
8
9 + zthfc->span.owner = THIS_MODULE;
10 zthfc->span.spanconfig = zthfc_spanconfig;
11 zthfc->span.chanconfig = zthfc_chanconfig;
12 zthfc->span.startup = zthfc_startup;
diff --git a/main/dahdi-linux-vserver/zaphfc-dahdi-2.4.0.patch b/main/dahdi-linux-vserver/zaphfc-dahdi-2.4.0.patch
new file mode 100644
index 0000000000..80500a574a
--- /dev/null
+++ b/main/dahdi-linux-vserver/zaphfc-dahdi-2.4.0.patch
@@ -0,0 +1,58 @@
1Index: dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c
2===================================================================
3--- dahdi-linux-2.4.0.orig/drivers/dahdi/zaphfc.c 2010-10-26 14:41:21.000000000 +0300
4+++ dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c 2010-10-26 14:50:14.000000000 +0300
5@@ -617,7 +617,7 @@
6 }
7
8 static int zthfc_startup(struct dahdi_span *span) {
9- struct dahdi_hfc *zthfc = span->pvt;
10+ struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
11 struct hfc_card *hfctmp = zthfc->card;
12 int alreadyrunning;
13
14@@ -663,6 +663,19 @@
15 return 0;
16 }
17
18+static const struct dahdi_span_ops zaphfc_span_ops = {
19+ .owner = THIS_MODULE,
20+ .spanconfig = zthfc_spanconfig,
21+ .chanconfig = zthfc_chanconfig,
22+ .startup = zthfc_startup,
23+ .shutdown = zthfc_shutdown,
24+ .maint = zthfc_maint,
25+ .rbsbits = zthfc_rbsbits,
26+ .open = zthfc_open,
27+ .close = zthfc_close,
28+ .ioctl = zthfc_ioctl,
29+};
30+
31 static int zthfc_initialize(struct dahdi_hfc *zthfc) {
32 struct hfc_card *hfctmp = zthfc->card;
33 int i;
34@@ -676,15 +689,7 @@
35 sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1);
36 }
37
38- zthfc->span.spanconfig = zthfc_spanconfig;
39- zthfc->span.chanconfig = zthfc_chanconfig;
40- zthfc->span.startup = zthfc_startup;
41- zthfc->span.shutdown = zthfc_shutdown;
42- zthfc->span.maint = zthfc_maint;
43- zthfc->span.rbsbits = zthfc_rbsbits;
44- zthfc->span.open = zthfc_open;
45- zthfc->span.close = zthfc_close;
46- zthfc->span.ioctl = zthfc_ioctl;
47+ zthfc->span.ops = &zaphfc_span_ops;
48
49 zthfc->span.channels = 3;
50 zthfc->span.chans = zthfc->_chans;
51@@ -695,7 +700,6 @@
52 zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
53 zthfc->span.offset = 0;
54 init_waitqueue_head(&zthfc->span.maintq);
55- zthfc->span.pvt = zthfc;
56
57 for (i = 0; i < zthfc->span.channels; i++) {
58 memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan));
© 2015 Mike Crute