]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blame - src/patches/mISDN-remove2.6.27-dsp-features.diff
projects / people / teissler / ipfire-2.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Cleanup: remove 2.1 to 2.3 updater
[people/teissler/ipfire-2.x.git] / src / patches / mISDN-remove2.6.27-dsp-features.diff
CommitLineData
0235d31b
AF		 1diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_cmx.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_cmx.c
2--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_cmx.c 2009-01-22 14:26:03.000000000 +0100
3+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_cmx.c 2009-04-04 19:06:14.000000000 +0200
4@@ -1138,11 +1138,7 @@
5 * also add delay if requested by PH_SIGNAL
6 */
7 if (dsp->rx_W < 0) {
8-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
9- if (dsp->features.unclocked) {
10-#else
11 if (dsp->features.has_jitter) {
12-#endif
13 dsp->rx_R = (hh->dinfo & CMX_BUFF_MASK);
14 dsp->rx_W = (dsp->rx_R+dsp->cmx_delay) & CMX_BUFF_MASK;
15 } else {
16@@ -1151,11 +1147,7 @@
17 }
18 }
19 /* if frame contains time code, write directly */
20-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
21- if (dsp->features.unclocked) {
22-#else
23 if (dsp->features.has_jitter) {
24-#endif
25 dsp->rx_W = (hh->dinfo & CMX_BUFF_MASK);
26 #warning remove me
27 printk(KERN_DEBUG "%s %08x\n", dsp->inst.name, hh->dinfo);
28diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp.h mISDN.git/drivers/isdn/hardware/mISDN/dsp.h
29--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp.h 2009-01-22 14:26:03.000000000 +0100
30+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp.h 2009-04-04 19:04:43.000000000 +0200
31@@ -159,7 +159,6 @@
32 * general stuff *
33 *****************/
34
35-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
36 struct dsp_features {
37 int hfc_id; // unique id to identify the chip (or -1)
38 int hfc_dtmf; // set if HFCmulti card supports dtmf
39@@ -170,7 +169,6 @@
40 int pcm_banks; // number of IO banks of pcm bus
41 int has_jitter; // data is jittered and unsorted
42 };
43-#endif
44
45 typedef struct _dsp {
46 struct list_head list;
47diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_hwec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_hwec.c
48--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_hwec.c 2009-01-22 14:26:03.000000000 +0100
49+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_hwec.c 2009-04-04 19:07:16.000000000 +0200
50@@ -30,24 +30,6 @@
51 #include <linux/mISDNif.h>
52 #include "dsp.h"
53 #include "helper.h"
54-
55-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
56-static struct mISDN_dsp_element_arg args[] = {
57- { "deftaps", "128", "Set the number of taps of cancellation." },
58-};
59-
60-static struct mISDN_dsp_element dsp_hwec_p = {
61- .name = "hwec",
62- .new = NULL,
63- .free = NULL,
64- .process_tx = NULL,
65- .process_rx = NULL,
66- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
67- .args = args,
68-};
69-struct mISDN_dsp_element *dsp_hwec = &dsp_hwec_p;
70-
71-#else
72 static mISDN_dsp_element_arg_t args[] = {
73 { "deftaps", "128", "Set the number of taps of cancellation." },
74 };
75@@ -62,7 +44,6 @@
76 .args = args,
77 };
78 mISDN_dsp_element_t *dsp_hwec = &dsp_hwec_p;
79-#endif
80
81 void dsp_hwec_enable (dsp_t *dsp, const char *arg)
82 {
83diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_kb1ec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_kb1ec.c
84--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_kb1ec.c 2009-01-22 14:26:03.000000000 +0100
85+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_kb1ec.c 2009-04-04 19:07:35.000000000 +0200
86@@ -90,22 +90,6 @@
87 dsp_cancel_rx(p, data, len);
88 }
89
90-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
91-static struct mISDN_dsp_element_arg args[] = {
92- { "deftaps", "128", "Set the number of taps of cancellation." },
93- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
94-};
95-
96-static struct mISDN_dsp_element dsp_kb1ec = {
97- .name = "kb1ec",
98- .new = new,
99- .free = free,
100- .process_tx = process_tx,
101- .process_rx = process_rx,
102- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
103- .args = args,
104-};
105-#else
106 static mISDN_dsp_element_arg_t args[] = {
107 { "deftaps", "128", "Set the number of taps of cancellation." },
108 { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
109@@ -120,7 +104,6 @@
110 .num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
111 .args = args,
112 };
113-#endif
114
115 #ifdef MODULE
116 static int __init dsp_kb1ec_init (void)
117diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mec2.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_mec2.c
118--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mec2.c 2009-01-22 14:26:03.000000000 +0100
119+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_mec2.c 2009-04-04 19:08:03.000000000 +0200
120@@ -91,22 +91,6 @@
121 dsp_cancel_rx(p, data, len);
122 }
123
124-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
125-static struct mISDN_dsp_element_arg args[] = {
126- { "deftaps", "128", "Set the number of taps of cancellation." },
127- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
128-};
129-
130-static struct mISDN_dsp_element dsp_mec2 = {
131- .name = "mec2",
132- .new = new,
133- .free = free,
134- .process_tx = process_tx,
135- .process_rx = process_rx,
136- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
137- .args = args,
138-};
139-#else
140 static mISDN_dsp_element_arg_t args[] = {
141 { "deftaps", "128", "Set the number of taps of cancellation." },
142 { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
143@@ -121,7 +105,6 @@
144 .num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
145 .args = args,
146 };
147-#endif
148
149 #ifdef MODULE
150 static int __init dsp_mec2_init (void)
151diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mg2ec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_mg2ec.c
152--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mg2ec.c 2009-01-22 14:26:03.000000000 +0100
153+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_mg2ec.c 2009-04-04 19:08:27.000000000 +0200
154@@ -90,22 +90,6 @@
155 dsp_cancel_rx(p, data, len);
156 }
157
158-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
159-static struct mISDN_dsp_element_arg args[] = {
160- { "deftaps", "128", "Set the number of taps of cancellation." },
161- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
162-};
163-
164-static struct mISDN_dsp_element dsp_mg2ec = {
165- .name = "mg2ec",
166- .new = new,
167- .free = free,
168- .process_tx = process_tx,
169- .process_rx = process_rx,
170- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
171- .args = args,
172-};
173-#else
174 static mISDN_dsp_element_arg_t args[] = {
175 { "deftaps", "128", "Set the number of taps of cancellation." },
176 { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
177@@ -120,7 +104,6 @@
178 .num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
179 .args = args,
180 };
181-#endif
182
183 #ifdef MODULE
184 static int __init dsp_mg2ec_init (void)
185diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_octwareec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_octwareec.c
186--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_octwareec.c 2009-01-22 14:26:03.000000000 +0100
187+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_octwareec.c 2009-04-04 19:09:07.000000000 +0200
188@@ -91,22 +91,6 @@
189 dsp_cancel_rx(p, data, len);
190 }
191
192-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
193-static struct mISDN_dsp_element_arg args[] = {
194- { "deftaps", "128", "Set the number of taps of cancellation." },
195- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
196-};
197-
198-static struct mISDN_dsp_element dsp_octwareec = {
199- .name = "octwareec",
200- .new = new,
201- .free = free,
202- .process_tx = process_tx,
203- .process_rx = process_rx,
204- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
205- .args = args,
206-};
207-#else
208 static mISDN_dsp_element_arg_t args[] = {
209 { "deftaps", "128", "Set the number of taps of cancellation." },
210 { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
211@@ -121,7 +105,6 @@
212 .num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
213 .args = args,
214 };
215-#endif
216
217 #ifdef MODULE
218 static int __init dsp_octwareec_init (void)
219diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_oslec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_oslec.c
220--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_oslec.c 2009-01-22 14:26:03.000000000 +0100
221+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_oslec.c 2009-04-04 19:09:34.000000000 +0200
222@@ -98,22 +98,6 @@
223 dsp_cancel_rx(p, data, len);
224 }
225
226-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
227-static struct mISDN_dsp_element_arg args[] = {
228- { "deftaps", "128", "Set the number of taps of cancellation." },
229- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
230-};
231-
232-static struct mISDN_dsp_element dsp_oslec = {
233- .name = "oslec",
234- .new = new,
235- .free = free,
236- .process_tx = process_tx,
237- .process_rx = process_rx,
238- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
239- .args = args,
240-};
241-#else
242 static mISDN_dsp_element_arg_t args[] = {
243 { "deftaps", "128", "Set the number of taps of cancellation." },
244 { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
245@@ -128,7 +112,6 @@
246 .num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
247 .args = args,
248 };
249-#endif
250
251 #ifdef MODULE
252 static int __init dsp_oslec_init (void)
253diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_pipeline.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_pipeline.c
254--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_pipeline.c 2009-01-22 14:26:03.000000000 +0100
255+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_pipeline.c 2009-04-04 19:13:05.000000000 +0200
256@@ -36,11 +36,7 @@
257 /* uncomment for debugging */
258 /*#define PIPELINE_DEBUG*/
259
260-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
261-extern struct mISDN_dsp_element *dsp_hwec;
262-#else
263 extern mISDN_dsp_element_t *dsp_hwec;
264-#endif
265
266 extern void dsp_hwec_enable (dsp_t *dsp, const char *arg);
267 extern void dsp_hwec_disable (dsp_t *dsp);
268@@ -48,21 +44,13 @@
269 extern void dsp_hwec_exit (void);
270
271 typedef struct _dsp_pipeline_entry {
272-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
273- struct mISDN_dsp_element *elem;
274-#else
275 mISDN_dsp_element_t *elem;
276-#endif
277 void *p;
278 struct list_head list;
279 } dsp_pipeline_entry_t;
280
281 typedef struct _dsp_element_entry {
282-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
283- struct mISDN_dsp_element *elem;
284- struct device dev;
285-
286-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
287+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
288 mISDN_dsp_element_t *elem;
289 struct device dev;
290
291@@ -95,11 +83,7 @@
292 #endif
293 };
294
295-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
296-static ssize_t attr_show_args (struct device *dev, struct device_attribute *attr, char *buf) {
297- struct mISDN_dsp_element *elem = dev_get_drvdata(dev);
298-
299-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
300+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
301 static ssize_t attr_show_args (struct device *dev, struct device_attribute *attr, char *buf) {
302 mISDN_dsp_element_t *elem = dev_get_drvdata(dev);
303
304@@ -125,14 +109,7 @@
305 return(len);
306 }
307
308-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
309-static struct device_attribute element_attributes[] = {
310- __ATTR(args, 0444, attr_show_args, NULL),
311-};
312-
313-int mISDN_dsp_element_register (struct mISDN_dsp_element *elem) {
314-
315-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
316+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
317 static struct device_attribute element_attributes[] = {
318 __ATTR(args, 0444, attr_show_args, NULL),
319 };
320@@ -201,12 +178,7 @@
321 return re;
322 }
323
324-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
325-void mISDN_dsp_element_unregister (struct mISDN_dsp_element *elem) {
326-
327-#else
328 void mISDN_dsp_element_unregister (mISDN_dsp_element_t *elem) {
329-#endif
330 dsp_element_entry_t *entry, *n;
331 u_long flags;
332
333@@ -319,11 +291,7 @@
334 char *dup, *tok, *name, *args;
335 dsp_element_entry_t *entry, *n;
336 dsp_pipeline_entry_t *pipeline_entry;
337-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
338- struct mISDN_dsp_element *elem;
339-#else
340 mISDN_dsp_element_t *elem;
341-#endif
342 u_long elements_flags, pipeline_flags;
343
344 if (!pipeline)
Timo's tree of IPFire 2.x