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