wok-next view mISDN/stuff/2.6.24.u @ rev 1864

Fix: tls DEPENDS.
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Tue Dec 16 01:40:23 2008 +0100 (2008-12-16)
parents
children
line source
1 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c
2 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c 2008-01-18 10:24:49.000000000 +0100
3 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c 2008-02-05 23:06:46.000000000 +0100
4 @@ -825,6 +825,7 @@
5 cmsg->LLC = &p[qi->llc.off + 1];
6 if (qi->hlc.off)
7 cmsg->HLC = &p[qi->hlc.off + 1];
8 +#ifdef CAPIUTIL_VERSION
9 #if CAPIUTIL_VERSION > 1
10 /* ETS 300 092 Annex B */
11 if (qi->calling_nr.repeated) {
12 @@ -834,6 +835,7 @@
13 int_error();
14 }
15 #endif
16 +#endif
17 // all else set to default
18 }
19 if (mISDN_FsmEvent(&aplci->plci_m, EV_PI_CONNECT_IND, cmsg))
20 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c
21 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-01-18 10:24:49.000000000 +0100
22 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-02-05 23:06:46.000000000 +0100
23 @@ -689,7 +689,11 @@
24 }
25
26 static irqreturn_t
27 +#ifdef OLD_IRQ_CALL
28 avm_fritz_interrupt(int intno, void *dev_id, struct pt_regs *regs)
29 +#else
30 +avm_fritz_interrupt(int intno, void *dev_id)
31 +#endif
32 {
33 fritzpnppci *fc = dev_id;
34 u_char val;
35 @@ -722,7 +726,11 @@
36 }
37
38 static irqreturn_t
39 +#ifdef OLD_IRQ_CALL
40 avm_fritzv2_interrupt(int intno, void *dev_id, struct pt_regs *regs)
41 +#else
42 +avm_fritzv2_interrupt(int intno, void *dev_id)
43 +#endif
44 {
45 fritzpnppci *fc = dev_id;
46 u_char val;
47 @@ -876,7 +884,7 @@
48 static int init_card(fritzpnppci *fc)
49 {
50 int cnt = 3;
51 - u_int shared = SA_SHIRQ;
52 + u_int shared = __IRQF_SHARED;
53 u_long flags;
54 u_char *id = "AVM Fritz!PCI";
55
56 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c
57 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c 2007-12-17 16:29:59.000000000 +0100
58 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c 2008-02-05 23:06:46.000000000 +0100
59 @@ -759,9 +759,11 @@
60 int
61 mISDNInit(void)
62 {
63 - DECLARE_MUTEX_LOCKED(sem);
64 + struct semaphore sem;
65 int err;
66
67 + init_MUTEX_LOCKED(&sem);
68 +
69 printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision);
70 core_debug = debug;
71 #ifdef MISDN_MEMDEBUG
72 @@ -801,7 +803,8 @@
73 }
74
75 void mISDN_cleanup(void) {
76 - DECLARE_MUTEX_LOCKED(sem);
77 + struct semaphore sem;
78 + init_MUTEX_LOCKED(&sem);
79
80 free_mISDNdev();
81 if (!list_empty(&mISDN_objectlist)) {
82 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c
83 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2008-01-18 10:24:50.000000000 +0100
84 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c 2008-02-05 23:10:32.000000000 +0100
85 @@ -1005,8 +1005,10 @@
86 /* fill mISDN object (dsp_obj) */
87 memset(&dsp_obj, 0, sizeof(dsp_obj));
88 #ifdef MODULE
89 +#ifdef SET_MODULE_OWNER
90 SET_MODULE_OWNER(&dsp_obj);
91 #endif
92 +#endif
93 spin_lock_init(&dsp_obj.lock);
94 dsp_obj.name = DSPName;
95 dsp_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_DSP;
96 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c
97 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-01-18 10:24:50.000000000 +0100
98 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-02-05 23:06:46.000000000 +0100
99 @@ -119,7 +119,7 @@
100 #define bugtest \
101 if (hc->irq) free_irq(hc->irq, hc); \
102 hc->irq = 0; \
103 - if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { \
104 + if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { \
105 printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); \
106 hc->irq = hc->pci_dev->irq; }
107 #endif
108 @@ -1930,7 +1930,11 @@
109 }
110
111 static irqreturn_t
112 +#ifdef OLD_IRQ_CALL
113 hfcmulti_interrupt(int intno, void *dev_id, struct pt_regs *regs)
114 +#else
115 +hfcmulti_interrupt(int intno, void *dev_id)
116 +#endif
117 {
118 #ifdef IRQCOUNT_DEBUG
119 static int iq1=0,iq2=0,iq3=0,iq4=0,iq5=0,iq6=0,iqcnt=0;
120 @@ -3294,7 +3298,7 @@
121 disable_hwirq(hc);
122 spin_unlock_irqrestore(&hc->lock, flags);
123
124 - if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) {
125 + if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) {
126 printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq);
127 return(-EIO);
128 }
129 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c
130 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-01-18 10:24:50.000000000 +0100
131 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-02-05 23:06:46.000000000 +0100
132 @@ -1034,7 +1034,11 @@
133 }
134
135 static irqreturn_t
136 +#ifdef OLD_IRQ_CALL
137 hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
138 +#else
139 +hfcpci_interrupt(int intno, void *dev_id)
140 +#endif
141 {
142 hfc_pci_t *hc = dev_id;
143 u_char exval;
144 @@ -1693,7 +1697,7 @@
145 spin_lock_irqsave(&hc->lock, flags);
146 disable_hwirq(hc);
147 spin_unlock_irqrestore(&hc->lock, flags);
148 - if (request_irq(hc->irq, hfcpci_interrupt, SA_SHIRQ, "HFC PCI", hc)) {
149 + if (request_irq(hc->irq, hfcpci_interrupt, __IRQF_SHARED, "HFC PCI", hc)) {
150 printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", hc->irq);
151 return(-EIO);
152 }
153 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c
154 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-01-18 10:24:50.000000000 +0100
155 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-02-05 23:06:46.000000000 +0100
156 @@ -983,7 +983,11 @@
157 /* Interrupt handler */
158 /*********************/
159 static irqreturn_t
160 +#ifdef OLD_IRQ_CALL
161 hfcsmini_interrupt(int intno, void *dev_id, struct pt_regs *regs)
162 +#else
163 +hfcsmini_interrupt(int intno, void *dev_id)
164 +#endif
165 {
166 __u8 fifo_irq, misc_irq;
167 hfcsmini_hw *hw = dev_id;
168 @@ -1587,7 +1591,7 @@
169 printk(KERN_WARNING "%s %s: requesting IRQ %d\n",
170 hw->card_name, __FUNCTION__, hw->irq);
171
172 - if (request_irq(hw->irq, hfcsmini_interrupt, SA_SHIRQ, "HFC-S mini", hw)) {
173 + if (request_irq(hw->irq, hfcsmini_interrupt, __IRQF_SHARED, "HFC-S mini", hw)) {
174 printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n",
175 hw->card_name, __FUNCTION__, hw->irq);
176
177 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c
178 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-01-18 10:24:50.000000000 +0100
179 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-02-05 23:06:46.000000000 +0100
180 @@ -1109,17 +1109,13 @@
181 {
182 int k;
183
184 - spin_lock_init(&urb->lock);
185 - urb->dev = dev;
186 - urb->pipe = pipe;
187 - urb->complete = complete;
188 + usb_fill_bulk_urb(urb, dev, pipe, buf, packet_size * num_packets, complete, context);
189 +
190 urb->number_of_packets = num_packets;
191 - urb->transfer_buffer_length = packet_size * num_packets;
192 - urb->context = context;
193 - urb->transfer_buffer = buf;
194 urb->transfer_flags = URB_ISO_ASAP;
195 urb->actual_length = 0;
196 urb->interval = interval;
197 +
198 for (k = 0; k < num_packets; k++) {
199 urb->iso_frame_desc[k].offset = packet_size * k;
200 urb->iso_frame_desc[k].length = packet_size;
201 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c
202 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c 2008-01-18 10:24:50.000000000 +0100
203 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c 2008-02-05 23:06:46.000000000 +0100
204 @@ -1463,7 +1463,11 @@
205 }
206
207 static irqreturn_t
208 +#ifdef OLD_IRQ_CALL
209 nj_interrupt(int intno, void *dev_id, struct pt_regs *regs)
210 +#else
211 +nj_interrupt(int intno, void *dev_id)
212 +#endif
213 {
214 netjet_t *card = dev_id;
215 u_int8_t val, s1val, s0val;
216 @@ -1544,7 +1548,7 @@
217 nj_disable_hwirq(card);
218 spin_unlock_irqrestore(&card->lock, flags);
219
220 - if (request_irq(card->irq, nj_interrupt, SA_SHIRQ, "NETjet", card)) {
221 + if (request_irq(card->irq, nj_interrupt, __IRQF_SHARED, "NETjet", card)) {
222 printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n",
223 card->irq);
224 return (-EIO);
225 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c
226 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-01-18 10:24:50.000000000 +0100
227 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-02-05 23:06:46.000000000 +0100
228 @@ -338,7 +338,7 @@
229 {
230 int cnt = 3;
231 u_long flags;
232 - u_int shared = SA_SHIRQ;
233 + u_int shared = __IRQF_SHARED;
234 void *irq_func = speedfax_pci_interrupt;
235
236 if (sf->subtyp == SEDL_SPEEDFAX_ISA) {
237 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c
238 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c 2008-01-18 10:24:50.000000000 +0100
239 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c 2008-02-05 23:06:46.000000000 +0100
240 @@ -786,9 +786,11 @@
241 static int
242 delete_stack(mISDNstack_t *st)
243 {
244 - DECLARE_MUTEX_LOCKED(sem);
245 + struct semaphore sem;
246 u_long flags;
247
248 + init_MUTEX_LOCKED(&sem);
249 +
250 if (core_debug & DEBUG_CORE_FUNC)
251 printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id);
252 mISDN_unregister_sysfs_st(st);
253 @@ -1198,7 +1200,8 @@
254 hhe->addr = st->id;
255
256 if (wait) {
257 - DECLARE_MUTEX_LOCKED(sem);
258 + struct semaphore sem;
259 + init_MUTEX_LOCKED(&sem);
260
261 hhe->data[0] = &sem;
262 _queue_message(st, skb);
263 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c
264 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c 2008-01-18 10:24:50.000000000 +0100
265 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c 2008-02-05 23:06:46.000000000 +0100
266 @@ -855,7 +855,11 @@
267 }
268
269 static irqreturn_t
270 +#ifdef OLD_IRQ_CALL
271 w6692_interrupt(int intno, void *dev_id, struct pt_regs *regs)
272 +#else
273 +w6692_interrupt(int intno, void *dev_id)
274 +#endif
275 {
276 w6692pci *card = dev_id;
277 u_char ista;
278 @@ -994,7 +998,7 @@
279 spin_lock_irqsave(&card->lock, flags);
280 disable_hwirq(card);
281 spin_unlock_irqrestore(&card->lock, flags);
282 - if (request_irq(card->irq, w6692_interrupt, SA_SHIRQ, "w6692", card)) {
283 + if (request_irq(card->irq, w6692_interrupt, __IRQF_SHARED, "w6692", card)) {
284 printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", card->irq);
285 return(-EIO);
286 }
287 diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c
288 --- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-01-18 10:24:50.000000000 +0100
289 +++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-02-05 23:06:46.000000000 +0100
290 @@ -1103,7 +1103,11 @@
291 /* Interrupt handler */
292 /*********************/
293 static irqreturn_t
294 +#ifdef OLD_IRQ_CALL
295 xhfc_interrupt(int intno, void *dev_id, struct pt_regs *regs)
296 +#else
297 +xhfc_interrupt(int intno, void *dev_id)
298 +#endif
299 {
300 xhfc_pi *pi = dev_id;
301 xhfc_t * xhfc = NULL;
302 @@ -2031,7 +2035,7 @@
303 }
304
305 /* init interrupt engine */
306 - if (request_irq(pi->irq, xhfc_interrupt, SA_SHIRQ, "XHFC", pi)) {
307 + if (request_irq(pi->irq, xhfc_interrupt, __IRQF_SHARED, "XHFC", pi)) {
308 printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n",
309 pi->name, __FUNCTION__, pi->irq);
310 pi->irq = 0;
311 diff -Naur mISDN-1_1_7_2.orig/include/linux/isdn_compat.h mISDN-1_1_7_2/include/linux/isdn_compat.h
312 --- mISDN-1_1_7_2.orig/include/linux/isdn_compat.h 2008-01-18 10:25:33.000000000 +0100
313 +++ mISDN-1_1_7_2/include/linux/isdn_compat.h 2008-02-05 23:06:46.000000000 +0100
314 @@ -128,6 +128,17 @@
315 #define MISDN_COMPAT_KMEMCACHE
316 #endif
317
318 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
319 +#define OLD_IRQ_CALL
320 +#else
321 +#undef OLD_IRQ_CALL
322 +#endif
323 +
324 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
325 +#define __IRQF_SHARED SA_SHIRQ
326 +#else
327 +#define __IRQF_SHARED IRQF_SHARED
328 +#endif
329
330
331 #endif /* __KERNEL__ */