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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
diff -ur zaptel-1.0.9.orig/Makefile zaptel-1.0.9/Makefile
--- zaptel-1.0.9.orig/Makefile 2005-05-12 04:26:49.000000000 +0200
+++ zaptel-1.0.9/Makefile 2005-07-03 13:36:31.000000000 +0200
@@ -343,7 +343,7 @@
clean:
rm -f torisatool makefw tor2fw.h
- rm -f zttool
+ rm -f zttool ztspeed zttest ztmonitor
rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
rm -f *.ko *.mod.c .*o.cmd
@@ -351,3 +351,4 @@
rm -f libtonezone*
rm -f tor2ee
rm -f core
+ rm -rf .tmp_versions
diff -ur zaptel-1.0.9.orig/zaptel.c zaptel-1.0.9/zaptel.c
--- zaptel-1.0.9.orig/zaptel.c 2005-06-15 23:31:22.000000000 +0200
+++ zaptel-1.0.9/zaptel.c 2005-07-03 13:36:31.000000000 +0200
@@ -4851,11 +4851,40 @@
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
}
bytes -= left;
+#ifdef CONFIG_ZAPATA_BRI_DCHANS
+ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
+ /*
+ * Let's get this right, we want to transmit complete frames only.
+ * The card driver will do the dirty HDLC work for us.
+ * txb (transmit buffer) is supposed to be big enough to store one frame
+ * we will make this as big as the D fifo (1KB or 2KB)
+ */
+
+ /* there are 'left' bytes in the user buffer left to transmit */
+ left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
+ if (left > ms->maxbytes2transmit) {
+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
+ ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
+ txb += ms->maxbytes2transmit;
+ ms->bytes2transmit = ms->maxbytes2transmit;
+ ms->eoftx = 0;
+ } else {
+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
+ ms->writeidx[ms->outwritebuf] += left + 2;
+ txb += left;
+ ms->bytes2transmit = left;
+ ms->eoftx = 1;
+ }
+ bytes = 0;
+#endif
} else {
memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
ms->writeidx[ms->outwritebuf]+=left;
txb += left;
bytes -= left;
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+ ms->bytes2transmit=ZT_CHUNKSIZE;
+#endif
}
/* Check buffer status */
if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
@@ -4900,6 +4929,17 @@
/* Transmit a flag if this is an HDLC channel */
if (ms->flags & ZT_FLAG_HDLC)
fasthdlc_tx_frame_nocheck(&ms->txhdlc);
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+ if(ms->flags & ZT_FLAG_BRIDCHAN) {
+ // if (ms->bytes2transmit > 0) {
+ // txb += 2;
+ // ms->bytes2transmit -= 2;
+ bytes=0;
+ ms->eoftx = 1;
+// printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
+ // }
+ }
+#endif
#ifdef CONFIG_ZAPATA_NET
if (ms->flags & ZT_FLAG_NETDEV)
netif_wake_queue(ztchan_to_dev(ms));
@@ -4910,7 +4950,7 @@
tasklet_schedule(&ms->ppp_calls);
}
#endif
- }
+ }
} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
left = ms->curtone->tonesamples - ms->tonep;
if (left > bytes)
@@ -4948,8 +4988,17 @@
} else if (ms->flags & ZT_FLAG_CLEAR) {
/* Clear channels should idle with 0xff for the sake
of silly PRI's that care about idle B channels */
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+ // ms->bytes2transmit=0;
+#endif
memset(txb, 0xff, bytes);
bytes = 0;
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+ } else if(ms->flags & ZT_FLAG_BRIDCHAN) {
+ // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
+ bytes = 0;
+ if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit);
+#endif
} else {
memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
bytes = 0;
@@ -5648,6 +5697,13 @@
int left, x;
int bytes = ZT_CHUNKSIZE;
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+ if (ms->flags & ZT_FLAG_BRIDCHAN) {
+ bytes = ms->bytes2receive;
+ if (bytes < 1) return;
+// printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
+ }
+#endif
while(bytes) {
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
@@ -5706,6 +5762,19 @@
}
}
}
+#ifdef CONFIG_ZAPATA_BRI_DCHANS
+ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
+ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
+ rxb += left;
+ ms->readidx[ms->inreadbuf] += left;
+ bytes -= left;
+ if (ms->eofrx == 1) {
+ eof=1;
+ }
+// printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
+ ms->bytes2receive = 0;
+ ms->eofrx = 0;
+#endif
} else {
/* Not HDLC */
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
diff -ur zaptel-1.0.9.orig/zaptel.h zaptel-1.0.9/zaptel.h
--- zaptel-1.0.9.orig/zaptel.h 2005-06-15 23:31:22.000000000 +0200
+++ zaptel-1.0.9/zaptel.h 2005-07-03 13:36:31.000000000 +0200
@@ -956,6 +956,13 @@
int do_ppp_error;
struct sk_buff_head ppp_rq;
#endif
+#ifdef CONFIG_ZAPATA_BRI_DCHANS
+ int bytes2receive;
+ int maxbytes2transmit; /* size of the tx buffer in the card driver */
+ int bytes2transmit;
+ int eofrx;
+ int eoftx;
+#endif
spinlock_t lock;
char name[40]; /* Name */
/* Specified by zaptel */
@@ -1030,7 +1037,7 @@
int txbufpolicy; /* Buffer policy */
int rxbufpolicy; /* Buffer policy */
int txdisable; /* Disable transmitter */
- int rxdisable; /* Disable receiver */
+ int rxdisable; /* Disable receiver */
/* Tone zone stuff */
@@ -1193,6 +1200,10 @@
#define ZT_FLAG_T1PPP (1 << 15)
#define ZT_FLAG_SIGFREEZE (1 << 16) /* Freeze signalling */
+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
+#define ZT_FLAG_BRIDCHAN (1 << 17)
+#endif
+
struct zt_span {
spinlock_t lock;
void *pvt; /* Private stuff */
diff -ur zaptel-1.0.9.orig/zconfig.h zaptel-1.0.9/zconfig.h
--- zaptel-1.0.9.orig/zconfig.h 2005-01-02 01:19:57.000000000 +0100
+++ zaptel-1.0.9/zconfig.h 2005-07-03 13:36:31.000000000 +0200
@@ -127,4 +127,10 @@
*/
/* #define TDM_REVH_MATCHALL */
+/*
+ * Uncomment the following for BRI D channels
+ *
+ */
+#define CONFIG_ZAPATA_BRI_DCHANS
+
#endif
|
GitWeb