wok-next diff mISDN/stuff/2.6.24.u @ rev 2887
syslinux: remove wrong keyboard in help
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon May 04 23:35:36 2009 +0200 (2009-05-04) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/mISDN/stuff/2.6.24.u Mon May 04 23:35:36 2009 +0200 1.3 @@ -0,0 +1,331 @@ 1.4 +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 1.5 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c 2008-01-18 10:24:49.000000000 +0100 1.6 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c 2008-02-05 23:06:46.000000000 +0100 1.7 +@@ -825,6 +825,7 @@ 1.8 + cmsg->LLC = &p[qi->llc.off + 1]; 1.9 + if (qi->hlc.off) 1.10 + cmsg->HLC = &p[qi->hlc.off + 1]; 1.11 ++#ifdef CAPIUTIL_VERSION 1.12 + #if CAPIUTIL_VERSION > 1 1.13 + /* ETS 300 092 Annex B */ 1.14 + if (qi->calling_nr.repeated) { 1.15 +@@ -834,6 +835,7 @@ 1.16 + int_error(); 1.17 + } 1.18 + #endif 1.19 ++#endif 1.20 + // all else set to default 1.21 + } 1.22 + if (mISDN_FsmEvent(&aplci->plci_m, EV_PI_CONNECT_IND, cmsg)) 1.23 +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 1.24 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-01-18 10:24:49.000000000 +0100 1.25 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-02-05 23:06:46.000000000 +0100 1.26 +@@ -689,7 +689,11 @@ 1.27 + } 1.28 + 1.29 + static irqreturn_t 1.30 ++#ifdef OLD_IRQ_CALL 1.31 + avm_fritz_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.32 ++#else 1.33 ++avm_fritz_interrupt(int intno, void *dev_id) 1.34 ++#endif 1.35 + { 1.36 + fritzpnppci *fc = dev_id; 1.37 + u_char val; 1.38 +@@ -722,7 +726,11 @@ 1.39 + } 1.40 + 1.41 + static irqreturn_t 1.42 ++#ifdef OLD_IRQ_CALL 1.43 + avm_fritzv2_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.44 ++#else 1.45 ++avm_fritzv2_interrupt(int intno, void *dev_id) 1.46 ++#endif 1.47 + { 1.48 + fritzpnppci *fc = dev_id; 1.49 + u_char val; 1.50 +@@ -876,7 +884,7 @@ 1.51 + static int init_card(fritzpnppci *fc) 1.52 + { 1.53 + int cnt = 3; 1.54 +- u_int shared = SA_SHIRQ; 1.55 ++ u_int shared = __IRQF_SHARED; 1.56 + u_long flags; 1.57 + u_char *id = "AVM Fritz!PCI"; 1.58 + 1.59 +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 1.60 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c 2007-12-17 16:29:59.000000000 +0100 1.61 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c 2008-02-05 23:06:46.000000000 +0100 1.62 +@@ -759,9 +759,11 @@ 1.63 + int 1.64 + mISDNInit(void) 1.65 + { 1.66 +- DECLARE_MUTEX_LOCKED(sem); 1.67 ++ struct semaphore sem; 1.68 + int err; 1.69 + 1.70 ++ init_MUTEX_LOCKED(&sem); 1.71 ++ 1.72 + printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision); 1.73 + core_debug = debug; 1.74 + #ifdef MISDN_MEMDEBUG 1.75 +@@ -801,7 +803,8 @@ 1.76 + } 1.77 + 1.78 + void mISDN_cleanup(void) { 1.79 +- DECLARE_MUTEX_LOCKED(sem); 1.80 ++ struct semaphore sem; 1.81 ++ init_MUTEX_LOCKED(&sem); 1.82 + 1.83 + free_mISDNdev(); 1.84 + if (!list_empty(&mISDN_objectlist)) { 1.85 +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 1.86 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2008-01-18 10:24:50.000000000 +0100 1.87 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c 2008-02-05 23:10:32.000000000 +0100 1.88 +@@ -1005,8 +1005,10 @@ 1.89 + /* fill mISDN object (dsp_obj) */ 1.90 + memset(&dsp_obj, 0, sizeof(dsp_obj)); 1.91 + #ifdef MODULE 1.92 ++#ifdef SET_MODULE_OWNER 1.93 + SET_MODULE_OWNER(&dsp_obj); 1.94 + #endif 1.95 ++#endif 1.96 + spin_lock_init(&dsp_obj.lock); 1.97 + dsp_obj.name = DSPName; 1.98 + dsp_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_DSP; 1.99 +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 1.100 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-01-18 10:24:50.000000000 +0100 1.101 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-02-05 23:06:46.000000000 +0100 1.102 +@@ -119,7 +119,7 @@ 1.103 + #define bugtest \ 1.104 + if (hc->irq) free_irq(hc->irq, hc); \ 1.105 + hc->irq = 0; \ 1.106 +- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { \ 1.107 ++ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { \ 1.108 + printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); \ 1.109 + hc->irq = hc->pci_dev->irq; } 1.110 + #endif 1.111 +@@ -1930,7 +1930,11 @@ 1.112 + } 1.113 + 1.114 + static irqreturn_t 1.115 ++#ifdef OLD_IRQ_CALL 1.116 + hfcmulti_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.117 ++#else 1.118 ++hfcmulti_interrupt(int intno, void *dev_id) 1.119 ++#endif 1.120 + { 1.121 + #ifdef IRQCOUNT_DEBUG 1.122 + static int iq1=0,iq2=0,iq3=0,iq4=0,iq5=0,iq6=0,iqcnt=0; 1.123 +@@ -3294,7 +3298,7 @@ 1.124 + disable_hwirq(hc); 1.125 + spin_unlock_irqrestore(&hc->lock, flags); 1.126 + 1.127 +- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { 1.128 ++ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { 1.129 + printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); 1.130 + return(-EIO); 1.131 + } 1.132 +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 1.133 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-01-18 10:24:50.000000000 +0100 1.134 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-02-05 23:06:46.000000000 +0100 1.135 +@@ -1034,7 +1034,11 @@ 1.136 + } 1.137 + 1.138 + static irqreturn_t 1.139 ++#ifdef OLD_IRQ_CALL 1.140 + hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.141 ++#else 1.142 ++hfcpci_interrupt(int intno, void *dev_id) 1.143 ++#endif 1.144 + { 1.145 + hfc_pci_t *hc = dev_id; 1.146 + u_char exval; 1.147 +@@ -1693,7 +1697,7 @@ 1.148 + spin_lock_irqsave(&hc->lock, flags); 1.149 + disable_hwirq(hc); 1.150 + spin_unlock_irqrestore(&hc->lock, flags); 1.151 +- if (request_irq(hc->irq, hfcpci_interrupt, SA_SHIRQ, "HFC PCI", hc)) { 1.152 ++ if (request_irq(hc->irq, hfcpci_interrupt, __IRQF_SHARED, "HFC PCI", hc)) { 1.153 + printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", hc->irq); 1.154 + return(-EIO); 1.155 + } 1.156 +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 1.157 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-01-18 10:24:50.000000000 +0100 1.158 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-02-05 23:06:46.000000000 +0100 1.159 +@@ -983,7 +983,11 @@ 1.160 + /* Interrupt handler */ 1.161 + /*********************/ 1.162 + static irqreturn_t 1.163 ++#ifdef OLD_IRQ_CALL 1.164 + hfcsmini_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.165 ++#else 1.166 ++hfcsmini_interrupt(int intno, void *dev_id) 1.167 ++#endif 1.168 + { 1.169 + __u8 fifo_irq, misc_irq; 1.170 + hfcsmini_hw *hw = dev_id; 1.171 +@@ -1587,7 +1591,7 @@ 1.172 + printk(KERN_WARNING "%s %s: requesting IRQ %d\n", 1.173 + hw->card_name, __FUNCTION__, hw->irq); 1.174 + 1.175 +- if (request_irq(hw->irq, hfcsmini_interrupt, SA_SHIRQ, "HFC-S mini", hw)) { 1.176 ++ if (request_irq(hw->irq, hfcsmini_interrupt, __IRQF_SHARED, "HFC-S mini", hw)) { 1.177 + printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", 1.178 + hw->card_name, __FUNCTION__, hw->irq); 1.179 + 1.180 +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 1.181 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-01-18 10:24:50.000000000 +0100 1.182 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-02-05 23:06:46.000000000 +0100 1.183 +@@ -1109,17 +1109,13 @@ 1.184 + { 1.185 + int k; 1.186 + 1.187 +- spin_lock_init(&urb->lock); 1.188 +- urb->dev = dev; 1.189 +- urb->pipe = pipe; 1.190 +- urb->complete = complete; 1.191 ++ usb_fill_bulk_urb(urb, dev, pipe, buf, packet_size * num_packets, complete, context); 1.192 ++ 1.193 + urb->number_of_packets = num_packets; 1.194 +- urb->transfer_buffer_length = packet_size * num_packets; 1.195 +- urb->context = context; 1.196 +- urb->transfer_buffer = buf; 1.197 + urb->transfer_flags = URB_ISO_ASAP; 1.198 + urb->actual_length = 0; 1.199 + urb->interval = interval; 1.200 ++ 1.201 + for (k = 0; k < num_packets; k++) { 1.202 + urb->iso_frame_desc[k].offset = packet_size * k; 1.203 + urb->iso_frame_desc[k].length = packet_size; 1.204 +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 1.205 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c 2008-01-18 10:24:50.000000000 +0100 1.206 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c 2008-02-05 23:06:46.000000000 +0100 1.207 +@@ -1463,7 +1463,11 @@ 1.208 + } 1.209 + 1.210 + static irqreturn_t 1.211 ++#ifdef OLD_IRQ_CALL 1.212 + nj_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.213 ++#else 1.214 ++nj_interrupt(int intno, void *dev_id) 1.215 ++#endif 1.216 + { 1.217 + netjet_t *card = dev_id; 1.218 + u_int8_t val, s1val, s0val; 1.219 +@@ -1544,7 +1548,7 @@ 1.220 + nj_disable_hwirq(card); 1.221 + spin_unlock_irqrestore(&card->lock, flags); 1.222 + 1.223 +- if (request_irq(card->irq, nj_interrupt, SA_SHIRQ, "NETjet", card)) { 1.224 ++ if (request_irq(card->irq, nj_interrupt, __IRQF_SHARED, "NETjet", card)) { 1.225 + printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", 1.226 + card->irq); 1.227 + return (-EIO); 1.228 +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 1.229 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-01-18 10:24:50.000000000 +0100 1.230 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-02-05 23:06:46.000000000 +0100 1.231 +@@ -338,7 +338,7 @@ 1.232 + { 1.233 + int cnt = 3; 1.234 + u_long flags; 1.235 +- u_int shared = SA_SHIRQ; 1.236 ++ u_int shared = __IRQF_SHARED; 1.237 + void *irq_func = speedfax_pci_interrupt; 1.238 + 1.239 + if (sf->subtyp == SEDL_SPEEDFAX_ISA) { 1.240 +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 1.241 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c 2008-01-18 10:24:50.000000000 +0100 1.242 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c 2008-02-05 23:06:46.000000000 +0100 1.243 +@@ -786,9 +786,11 @@ 1.244 + static int 1.245 + delete_stack(mISDNstack_t *st) 1.246 + { 1.247 +- DECLARE_MUTEX_LOCKED(sem); 1.248 ++ struct semaphore sem; 1.249 + u_long flags; 1.250 + 1.251 ++ init_MUTEX_LOCKED(&sem); 1.252 ++ 1.253 + if (core_debug & DEBUG_CORE_FUNC) 1.254 + printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id); 1.255 + mISDN_unregister_sysfs_st(st); 1.256 +@@ -1198,7 +1200,8 @@ 1.257 + hhe->addr = st->id; 1.258 + 1.259 + if (wait) { 1.260 +- DECLARE_MUTEX_LOCKED(sem); 1.261 ++ struct semaphore sem; 1.262 ++ init_MUTEX_LOCKED(&sem); 1.263 + 1.264 + hhe->data[0] = &sem; 1.265 + _queue_message(st, skb); 1.266 +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 1.267 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c 2008-01-18 10:24:50.000000000 +0100 1.268 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c 2008-02-05 23:06:46.000000000 +0100 1.269 +@@ -855,7 +855,11 @@ 1.270 + } 1.271 + 1.272 + static irqreturn_t 1.273 ++#ifdef OLD_IRQ_CALL 1.274 + w6692_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.275 ++#else 1.276 ++w6692_interrupt(int intno, void *dev_id) 1.277 ++#endif 1.278 + { 1.279 + w6692pci *card = dev_id; 1.280 + u_char ista; 1.281 +@@ -994,7 +998,7 @@ 1.282 + spin_lock_irqsave(&card->lock, flags); 1.283 + disable_hwirq(card); 1.284 + spin_unlock_irqrestore(&card->lock, flags); 1.285 +- if (request_irq(card->irq, w6692_interrupt, SA_SHIRQ, "w6692", card)) { 1.286 ++ if (request_irq(card->irq, w6692_interrupt, __IRQF_SHARED, "w6692", card)) { 1.287 + printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", card->irq); 1.288 + return(-EIO); 1.289 + } 1.290 +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 1.291 +--- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-01-18 10:24:50.000000000 +0100 1.292 ++++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-02-05 23:06:46.000000000 +0100 1.293 +@@ -1103,7 +1103,11 @@ 1.294 + /* Interrupt handler */ 1.295 + /*********************/ 1.296 + static irqreturn_t 1.297 ++#ifdef OLD_IRQ_CALL 1.298 + xhfc_interrupt(int intno, void *dev_id, struct pt_regs *regs) 1.299 ++#else 1.300 ++xhfc_interrupt(int intno, void *dev_id) 1.301 ++#endif 1.302 + { 1.303 + xhfc_pi *pi = dev_id; 1.304 + xhfc_t * xhfc = NULL; 1.305 +@@ -2031,7 +2035,7 @@ 1.306 + } 1.307 + 1.308 + /* init interrupt engine */ 1.309 +- if (request_irq(pi->irq, xhfc_interrupt, SA_SHIRQ, "XHFC", pi)) { 1.310 ++ if (request_irq(pi->irq, xhfc_interrupt, __IRQF_SHARED, "XHFC", pi)) { 1.311 + printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", 1.312 + pi->name, __FUNCTION__, pi->irq); 1.313 + pi->irq = 0; 1.314 +diff -Naur mISDN-1_1_7_2.orig/include/linux/isdn_compat.h mISDN-1_1_7_2/include/linux/isdn_compat.h 1.315 +--- mISDN-1_1_7_2.orig/include/linux/isdn_compat.h 2008-01-18 10:25:33.000000000 +0100 1.316 ++++ mISDN-1_1_7_2/include/linux/isdn_compat.h 2008-02-05 23:06:46.000000000 +0100 1.317 +@@ -128,6 +128,17 @@ 1.318 + #define MISDN_COMPAT_KMEMCACHE 1.319 + #endif 1.320 + 1.321 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 1.322 ++#define OLD_IRQ_CALL 1.323 ++#else 1.324 ++#undef OLD_IRQ_CALL 1.325 ++#endif 1.326 ++ 1.327 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) 1.328 ++#define __IRQF_SHARED SA_SHIRQ 1.329 ++#else 1.330 ++#define __IRQF_SHARED IRQF_SHARED 1.331 ++#endif 1.332 + 1.333 + 1.334 + #endif /* __KERNEL__ */