1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c
===================================================================
--- dahdi-linux-2.5.0.orig/drivers/dahdi/zaphfc.c 2011-08-15 15:49:47.000000000 +0300
+++ dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c 2011-08-15 15:50:07.000000000 +0300
@@ -26,6 +26,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
+#include <linux/sched.h>
#include <dahdi/kernel.h>
#include "zaphfc.h"
@@ -616,7 +617,7 @@
return 0;
}
-static int zthfc_startup(struct dahdi_span *span) {
+static int zthfc_startup(struct file *file, struct dahdi_span *span) {
struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
struct hfc_card *hfctmp = zthfc->card;
int alreadyrunning;
@@ -653,12 +654,12 @@
return 0;
}
-static int zthfc_chanconfig(struct dahdi_chan *chan, int sigtype) {
+static int zthfc_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) {
// printk(KERN_CRIT "chan_config sigtype=%d\n", sigtype);
return 0;
}
-static int zthfc_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) {
+static int zthfc_spanconfig(struct file *file, struct dahdi_span *span, struct dahdi_lineconfig *lc) {
span->lineconfig = lc->lineconfig;
return 0;
}
@@ -699,7 +700,6 @@
zthfc->span.deflaw = DAHDI_LAW_ALAW;
zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
zthfc->span.offset = 0;
- init_waitqueue_head(&zthfc->span.maintq);
for (i = 0; i < zthfc->span.channels; i++) {
memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan));
|
