wok-6.x rev 3036
Up: mISDNuser (20080827)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue May 12 15:58:54 2009 +0200 (2009-05-12) |
| parents | 94147f719bb9 |
| children | bc0c0dd7a7f0 |
| files | mISDN/receipt mISDN/stuff/2.6.24.u mISDN/stuff/2.6.25.u mISDN/stuff/Makefile.u mISDNuser-dev/receipt mISDNuser/receipt mISDNuser/stuff/Makefile.u |
line diff
1.1 --- a/mISDN/receipt Tue May 12 14:59:16 2009 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,64 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="mISDN" 1.7 -VERSION="1_1_7_2" 1.8 -CATEGORY="system-tools" 1.9 -SHORT_DESC="beronet isdn drivers." 1.10 -MAINTAINER="pascal.bellard@slitaz.org" 1.11 -TARBALL="$PACKAGE-$VERSION.tar.gz" 1.12 -WEB_SITE="http://www.misdn.org/" 1.13 -WGET_URL="${WEB_SITE}downloads/releases/$TARBALL" 1.14 -DEPENDS="linux" 1.15 -BUILD_DEPENDS="linux" 1.16 - 1.17 -# Rules to configure and make the package. 1.18 -compile_rules() 1.19 -{ 1.20 - if [ ! -d $WOK/linux/taz ]; then 1.21 - tazwok cook linux 1.22 - fi 1.23 - KVERS=$(grep "kernel version" $WOK/linux/$(ls $WOK/linux/taz)/.config) 1.24 - KVERS=${KVERS##* } 1.25 - KSRC=$(cd $WOK/linux/$(ls $WOK/linux/taz) ; pwd) 1.26 - cd $src 1.27 - while read file; do 1.28 - [ -f done.$file ] && continue 1.29 - patch -p1 < ../stuff/$file || return 1 1.30 - touch done.$file 1.31 - done <<EOT 1.32 -Makefile.u 1.33 -${KVERS%.*}.u 1.34 -EOT 1.35 - cp -a include/linux drivers/isdn/hardware/mISDN/ 1.36 - ln -s . drivers/isdn/hardware/mISDN/linux/linux 1.37 - for i in $(cd include; ls linux/*); do 1.38 - sed -i "s,.$i.,\"$i\"," drivers/isdn/hardware/mISDN/*.? \ 1.39 - drivers/isdn/hardware/mISDN/linux/*.? 1.40 - done 1.41 - sed -i "s,MISDNVERSION,\"$(cat VERSION)\"," drivers/isdn/hardware/mISDN/*.c 1.42 - sed -i 's/depmod/echo/' Makefile 1.43 - make KVERS=$KVERS LINUX=$KSRC KBUILD_NOPEDANTIC=1 DESTDIR=$PWD/_pkg install 1.44 -} 1.45 - 1.46 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.47 -genpkg_rules() 1.48 -{ 1.49 - KVERS=$(grep "kernel version" ../linux/$(ls ../linux/taz)/.config) 1.50 - EXTRAVERSION=_${KVERS##* } 1.51 - mkdir -p $fs/usr $fs/etc 1.52 - ( cd $_pkg ; tar cf - lib/modules/*/extra ) | ( cd $fs ; tar xf - ) 1.53 - cp -a $_pkg/usr/* $fs/usr 1.54 - cp -a $_pkg/etc/* $fs/etc 1.55 -} 1.56 - 1.57 -# Post install/remove commands for Tazpkg. 1.58 -post_install() 1.59 -{ 1.60 - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 1.61 -} 1.62 - 1.63 -post_remove() 1.64 -{ 1.65 - depmod -a 1.66 -} 1.67 -
2.1 --- a/mISDN/stuff/2.6.24.u Tue May 12 14:59:16 2009 +0200 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,331 +0,0 @@ 2.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 2.5 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c 2008-01-18 10:24:49.000000000 +0100 2.6 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c 2008-02-05 23:06:46.000000000 +0100 2.7 -@@ -825,6 +825,7 @@ 2.8 - cmsg->LLC = &p[qi->llc.off + 1]; 2.9 - if (qi->hlc.off) 2.10 - cmsg->HLC = &p[qi->hlc.off + 1]; 2.11 -+#ifdef CAPIUTIL_VERSION 2.12 - #if CAPIUTIL_VERSION > 1 2.13 - /* ETS 300 092 Annex B */ 2.14 - if (qi->calling_nr.repeated) { 2.15 -@@ -834,6 +835,7 @@ 2.16 - int_error(); 2.17 - } 2.18 - #endif 2.19 -+#endif 2.20 - // all else set to default 2.21 - } 2.22 - if (mISDN_FsmEvent(&aplci->plci_m, EV_PI_CONNECT_IND, cmsg)) 2.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 2.24 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-01-18 10:24:49.000000000 +0100 2.25 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-02-05 23:06:46.000000000 +0100 2.26 -@@ -689,7 +689,11 @@ 2.27 - } 2.28 - 2.29 - static irqreturn_t 2.30 -+#ifdef OLD_IRQ_CALL 2.31 - avm_fritz_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.32 -+#else 2.33 -+avm_fritz_interrupt(int intno, void *dev_id) 2.34 -+#endif 2.35 - { 2.36 - fritzpnppci *fc = dev_id; 2.37 - u_char val; 2.38 -@@ -722,7 +726,11 @@ 2.39 - } 2.40 - 2.41 - static irqreturn_t 2.42 -+#ifdef OLD_IRQ_CALL 2.43 - avm_fritzv2_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.44 -+#else 2.45 -+avm_fritzv2_interrupt(int intno, void *dev_id) 2.46 -+#endif 2.47 - { 2.48 - fritzpnppci *fc = dev_id; 2.49 - u_char val; 2.50 -@@ -876,7 +884,7 @@ 2.51 - static int init_card(fritzpnppci *fc) 2.52 - { 2.53 - int cnt = 3; 2.54 -- u_int shared = SA_SHIRQ; 2.55 -+ u_int shared = __IRQF_SHARED; 2.56 - u_long flags; 2.57 - u_char *id = "AVM Fritz!PCI"; 2.58 - 2.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 2.60 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c 2007-12-17 16:29:59.000000000 +0100 2.61 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c 2008-02-05 23:06:46.000000000 +0100 2.62 -@@ -759,9 +759,11 @@ 2.63 - int 2.64 - mISDNInit(void) 2.65 - { 2.66 -- DECLARE_MUTEX_LOCKED(sem); 2.67 -+ struct semaphore sem; 2.68 - int err; 2.69 - 2.70 -+ init_MUTEX_LOCKED(&sem); 2.71 -+ 2.72 - printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision); 2.73 - core_debug = debug; 2.74 - #ifdef MISDN_MEMDEBUG 2.75 -@@ -801,7 +803,8 @@ 2.76 - } 2.77 - 2.78 - void mISDN_cleanup(void) { 2.79 -- DECLARE_MUTEX_LOCKED(sem); 2.80 -+ struct semaphore sem; 2.81 -+ init_MUTEX_LOCKED(&sem); 2.82 - 2.83 - free_mISDNdev(); 2.84 - if (!list_empty(&mISDN_objectlist)) { 2.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 2.86 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2008-01-18 10:24:50.000000000 +0100 2.87 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c 2008-02-05 23:10:32.000000000 +0100 2.88 -@@ -1005,8 +1005,10 @@ 2.89 - /* fill mISDN object (dsp_obj) */ 2.90 - memset(&dsp_obj, 0, sizeof(dsp_obj)); 2.91 - #ifdef MODULE 2.92 -+#ifdef SET_MODULE_OWNER 2.93 - SET_MODULE_OWNER(&dsp_obj); 2.94 - #endif 2.95 -+#endif 2.96 - spin_lock_init(&dsp_obj.lock); 2.97 - dsp_obj.name = DSPName; 2.98 - dsp_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_DSP; 2.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 2.100 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-01-18 10:24:50.000000000 +0100 2.101 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-02-05 23:06:46.000000000 +0100 2.102 -@@ -119,7 +119,7 @@ 2.103 - #define bugtest \ 2.104 - if (hc->irq) free_irq(hc->irq, hc); \ 2.105 - hc->irq = 0; \ 2.106 -- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { \ 2.107 -+ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { \ 2.108 - printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); \ 2.109 - hc->irq = hc->pci_dev->irq; } 2.110 - #endif 2.111 -@@ -1930,7 +1930,11 @@ 2.112 - } 2.113 - 2.114 - static irqreturn_t 2.115 -+#ifdef OLD_IRQ_CALL 2.116 - hfcmulti_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.117 -+#else 2.118 -+hfcmulti_interrupt(int intno, void *dev_id) 2.119 -+#endif 2.120 - { 2.121 - #ifdef IRQCOUNT_DEBUG 2.122 - static int iq1=0,iq2=0,iq3=0,iq4=0,iq5=0,iq6=0,iqcnt=0; 2.123 -@@ -3294,7 +3298,7 @@ 2.124 - disable_hwirq(hc); 2.125 - spin_unlock_irqrestore(&hc->lock, flags); 2.126 - 2.127 -- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { 2.128 -+ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { 2.129 - printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); 2.130 - return(-EIO); 2.131 - } 2.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 2.133 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-01-18 10:24:50.000000000 +0100 2.134 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-02-05 23:06:46.000000000 +0100 2.135 -@@ -1034,7 +1034,11 @@ 2.136 - } 2.137 - 2.138 - static irqreturn_t 2.139 -+#ifdef OLD_IRQ_CALL 2.140 - hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.141 -+#else 2.142 -+hfcpci_interrupt(int intno, void *dev_id) 2.143 -+#endif 2.144 - { 2.145 - hfc_pci_t *hc = dev_id; 2.146 - u_char exval; 2.147 -@@ -1693,7 +1697,7 @@ 2.148 - spin_lock_irqsave(&hc->lock, flags); 2.149 - disable_hwirq(hc); 2.150 - spin_unlock_irqrestore(&hc->lock, flags); 2.151 -- if (request_irq(hc->irq, hfcpci_interrupt, SA_SHIRQ, "HFC PCI", hc)) { 2.152 -+ if (request_irq(hc->irq, hfcpci_interrupt, __IRQF_SHARED, "HFC PCI", hc)) { 2.153 - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", hc->irq); 2.154 - return(-EIO); 2.155 - } 2.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 2.157 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-01-18 10:24:50.000000000 +0100 2.158 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-02-05 23:06:46.000000000 +0100 2.159 -@@ -983,7 +983,11 @@ 2.160 - /* Interrupt handler */ 2.161 - /*********************/ 2.162 - static irqreturn_t 2.163 -+#ifdef OLD_IRQ_CALL 2.164 - hfcsmini_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.165 -+#else 2.166 -+hfcsmini_interrupt(int intno, void *dev_id) 2.167 -+#endif 2.168 - { 2.169 - __u8 fifo_irq, misc_irq; 2.170 - hfcsmini_hw *hw = dev_id; 2.171 -@@ -1587,7 +1591,7 @@ 2.172 - printk(KERN_WARNING "%s %s: requesting IRQ %d\n", 2.173 - hw->card_name, __FUNCTION__, hw->irq); 2.174 - 2.175 -- if (request_irq(hw->irq, hfcsmini_interrupt, SA_SHIRQ, "HFC-S mini", hw)) { 2.176 -+ if (request_irq(hw->irq, hfcsmini_interrupt, __IRQF_SHARED, "HFC-S mini", hw)) { 2.177 - printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", 2.178 - hw->card_name, __FUNCTION__, hw->irq); 2.179 - 2.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 2.181 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-01-18 10:24:50.000000000 +0100 2.182 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-02-05 23:06:46.000000000 +0100 2.183 -@@ -1109,17 +1109,13 @@ 2.184 - { 2.185 - int k; 2.186 - 2.187 -- spin_lock_init(&urb->lock); 2.188 -- urb->dev = dev; 2.189 -- urb->pipe = pipe; 2.190 -- urb->complete = complete; 2.191 -+ usb_fill_bulk_urb(urb, dev, pipe, buf, packet_size * num_packets, complete, context); 2.192 -+ 2.193 - urb->number_of_packets = num_packets; 2.194 -- urb->transfer_buffer_length = packet_size * num_packets; 2.195 -- urb->context = context; 2.196 -- urb->transfer_buffer = buf; 2.197 - urb->transfer_flags = URB_ISO_ASAP; 2.198 - urb->actual_length = 0; 2.199 - urb->interval = interval; 2.200 -+ 2.201 - for (k = 0; k < num_packets; k++) { 2.202 - urb->iso_frame_desc[k].offset = packet_size * k; 2.203 - urb->iso_frame_desc[k].length = packet_size; 2.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 2.205 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c 2008-01-18 10:24:50.000000000 +0100 2.206 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c 2008-02-05 23:06:46.000000000 +0100 2.207 -@@ -1463,7 +1463,11 @@ 2.208 - } 2.209 - 2.210 - static irqreturn_t 2.211 -+#ifdef OLD_IRQ_CALL 2.212 - nj_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.213 -+#else 2.214 -+nj_interrupt(int intno, void *dev_id) 2.215 -+#endif 2.216 - { 2.217 - netjet_t *card = dev_id; 2.218 - u_int8_t val, s1val, s0val; 2.219 -@@ -1544,7 +1548,7 @@ 2.220 - nj_disable_hwirq(card); 2.221 - spin_unlock_irqrestore(&card->lock, flags); 2.222 - 2.223 -- if (request_irq(card->irq, nj_interrupt, SA_SHIRQ, "NETjet", card)) { 2.224 -+ if (request_irq(card->irq, nj_interrupt, __IRQF_SHARED, "NETjet", card)) { 2.225 - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", 2.226 - card->irq); 2.227 - return (-EIO); 2.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 2.229 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-01-18 10:24:50.000000000 +0100 2.230 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-02-05 23:06:46.000000000 +0100 2.231 -@@ -338,7 +338,7 @@ 2.232 - { 2.233 - int cnt = 3; 2.234 - u_long flags; 2.235 -- u_int shared = SA_SHIRQ; 2.236 -+ u_int shared = __IRQF_SHARED; 2.237 - void *irq_func = speedfax_pci_interrupt; 2.238 - 2.239 - if (sf->subtyp == SEDL_SPEEDFAX_ISA) { 2.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 2.241 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c 2008-01-18 10:24:50.000000000 +0100 2.242 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c 2008-02-05 23:06:46.000000000 +0100 2.243 -@@ -786,9 +786,11 @@ 2.244 - static int 2.245 - delete_stack(mISDNstack_t *st) 2.246 - { 2.247 -- DECLARE_MUTEX_LOCKED(sem); 2.248 -+ struct semaphore sem; 2.249 - u_long flags; 2.250 - 2.251 -+ init_MUTEX_LOCKED(&sem); 2.252 -+ 2.253 - if (core_debug & DEBUG_CORE_FUNC) 2.254 - printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id); 2.255 - mISDN_unregister_sysfs_st(st); 2.256 -@@ -1198,7 +1200,8 @@ 2.257 - hhe->addr = st->id; 2.258 - 2.259 - if (wait) { 2.260 -- DECLARE_MUTEX_LOCKED(sem); 2.261 -+ struct semaphore sem; 2.262 -+ init_MUTEX_LOCKED(&sem); 2.263 - 2.264 - hhe->data[0] = &sem; 2.265 - _queue_message(st, skb); 2.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 2.267 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c 2008-01-18 10:24:50.000000000 +0100 2.268 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c 2008-02-05 23:06:46.000000000 +0100 2.269 -@@ -855,7 +855,11 @@ 2.270 - } 2.271 - 2.272 - static irqreturn_t 2.273 -+#ifdef OLD_IRQ_CALL 2.274 - w6692_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.275 -+#else 2.276 -+w6692_interrupt(int intno, void *dev_id) 2.277 -+#endif 2.278 - { 2.279 - w6692pci *card = dev_id; 2.280 - u_char ista; 2.281 -@@ -994,7 +998,7 @@ 2.282 - spin_lock_irqsave(&card->lock, flags); 2.283 - disable_hwirq(card); 2.284 - spin_unlock_irqrestore(&card->lock, flags); 2.285 -- if (request_irq(card->irq, w6692_interrupt, SA_SHIRQ, "w6692", card)) { 2.286 -+ if (request_irq(card->irq, w6692_interrupt, __IRQF_SHARED, "w6692", card)) { 2.287 - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", card->irq); 2.288 - return(-EIO); 2.289 - } 2.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 2.291 ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-01-18 10:24:50.000000000 +0100 2.292 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-02-05 23:06:46.000000000 +0100 2.293 -@@ -1103,7 +1103,11 @@ 2.294 - /* Interrupt handler */ 2.295 - /*********************/ 2.296 - static irqreturn_t 2.297 -+#ifdef OLD_IRQ_CALL 2.298 - xhfc_interrupt(int intno, void *dev_id, struct pt_regs *regs) 2.299 -+#else 2.300 -+xhfc_interrupt(int intno, void *dev_id) 2.301 -+#endif 2.302 - { 2.303 - xhfc_pi *pi = dev_id; 2.304 - xhfc_t * xhfc = NULL; 2.305 -@@ -2031,7 +2035,7 @@ 2.306 - } 2.307 - 2.308 - /* init interrupt engine */ 2.309 -- if (request_irq(pi->irq, xhfc_interrupt, SA_SHIRQ, "XHFC", pi)) { 2.310 -+ if (request_irq(pi->irq, xhfc_interrupt, __IRQF_SHARED, "XHFC", pi)) { 2.311 - printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", 2.312 - pi->name, __FUNCTION__, pi->irq); 2.313 - pi->irq = 0; 2.314 -diff -Naur mISDN-1_1_7_2.orig/include/linux/isdn_compat.h mISDN-1_1_7_2/include/linux/isdn_compat.h 2.315 ---- mISDN-1_1_7_2.orig/include/linux/isdn_compat.h 2008-01-18 10:25:33.000000000 +0100 2.316 -+++ mISDN-1_1_7_2/include/linux/isdn_compat.h 2008-02-05 23:06:46.000000000 +0100 2.317 -@@ -128,6 +128,17 @@ 2.318 - #define MISDN_COMPAT_KMEMCACHE 2.319 - #endif 2.320 - 2.321 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 2.322 -+#define OLD_IRQ_CALL 2.323 -+#else 2.324 -+#undef OLD_IRQ_CALL 2.325 -+#endif 2.326 -+ 2.327 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) 2.328 -+#define __IRQF_SHARED SA_SHIRQ 2.329 -+#else 2.330 -+#define __IRQF_SHARED IRQF_SHARED 2.331 -+#endif 2.332 - 2.333 - 2.334 - #endif /* __KERNEL__ */
3.1 --- a/mISDN/stuff/2.6.25.u Tue May 12 14:59:16 2009 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,1 +0,0 @@ 3.4 -2.6.24.u 3.5 \ No newline at end of file
4.1 --- a/mISDN/stuff/Makefile.u Tue May 12 14:59:16 2009 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,36 +0,0 @@ 4.4 ---- mISDN-1_1_7_2/config/Makefile 4.5 -+++ mISDN-1_1_7_2/config/Makefile 4.6 -@@ -3,8 +3,9 @@ 4.7 - @echo "Please run 'make install'." 4.8 - 4.9 - install: 4.10 -- install -D -m755 mISDN $(INSTALL_PREFIX)/usr/sbin/mISDN 4.11 -- for file in $(shell echo *.xsl); do install -D -m644 $${file} $(INSTALL_PREFIX)/usr/lib/mISDN/$${file}; done 4.12 -+ mkdir -p $(INSTALL_PREFIX)/usr/sbin $(INSTALL_PREFIX)/usr/lib/mISDN 4.13 -+ cp mISDN $(INSTALL_PREFIX)/usr/sbin/mISDN 4.14 -+ for file in $(shell echo *.xsl); do cp $${file} $(INSTALL_PREFIX)/usr/lib/mISDN/$${file}; done 4.15 - if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \ 4.16 - if [ -e $(INSTALL_PREFIX)/etc/init.d/mISDN ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/mISDN; fi; \ 4.17 - ln -s $(INSTALL_PREFIX)/usr/sbin/mISDN $(INSTALL_PREFIX)/etc/init.d/mISDN; \ 4.18 ---- mISDN-1_1_7_2/Makefile 4.19 -+++ mISDN-1_1_7_2/Makefile 4.20 -@@ -4,7 +4,7 @@ 4.21 - MINOR=1 4.22 - SUBMINOR=7_2 4.23 - 4.24 --INSTALL_PREFIX := / 4.25 -+INSTALL_PREFIX:=$(DESTDIR) 4.26 - export INSTALL_PREFIX 4.27 - 4.28 - #PATH to linux source/headers 4.29 -@@ -15,8 +15,9 @@ 4.30 - endif 4.31 - 4.32 - MODS=/lib/modules/$(KVERS) 4.33 -+ifndef LINUX 4.34 - LINUX=$(MODS)/build 4.35 --LINUX_SOURCE=$(MODS)/source 4.36 -+endif 4.37 - UPDATE_MODULES=$(shell which update-modules) 4.38 - MODULES_UPDATE=$(shell which modules-update) 4.39 - DEPMOD=$(shell which depmod)
5.1 --- a/mISDNuser-dev/receipt Tue May 12 14:59:16 2009 +0200 5.2 +++ b/mISDNuser-dev/receipt Tue May 12 15:58:54 2009 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="mISDNuser-dev" 5.7 -VERSION="1_1_7_2" 5.8 +VERSION="20080827" 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="beronet isdn drivers userland dev files." 5.11 MAINTAINER="pascal.bellard@slitaz.org"
6.1 --- a/mISDNuser/receipt Tue May 12 14:59:16 2009 +0200 6.2 +++ b/mISDNuser/receipt Tue May 12 15:58:54 2009 +0200 6.3 @@ -1,22 +1,22 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="mISDNuser" 6.7 -VERSION="1_1_7_2" 6.8 +VERSION="20080827" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="beronet isdn drivers userland tools." 6.11 MAINTAINER="pascal.bellard@slitaz.org" 6.12 -TARBALL="$PACKAGE-$VERSION.tar.gz" 6.13 +TARBALL="${PACKAGE}_${VERSION}.tar.gz" 6.14 WEB_SITE="http://www.misdn.org/" 6.15 WGET_URL="${WEB_SITE}downloads/releases/$TARBALL" 6.16 -DEPENDS="mISDN ncurses" 6.17 -BUILD_DEPENDS="mISDN" 6.18 +DEPENDS="linux-isdn ncurses" 6.19 6.20 # Rules to configure and make the package. 6.21 compile_rules() 6.22 { 6.23 + mv $PACKAGE $src 2> /dev/null 6.24 cd $src 6.25 - [ -f done.Makefile.u ] || patch -p1 < ../stuff/Makefile.u 6.26 - touch done.Makefile.u 6.27 + mkdir -p _pkg/usr/lib 2> /dev/null 6.28 + sed -i 's/^INSTALL_PREFIX.*/INSTALL_PREFIX := $(DESTDIR)/' Makefile 6.29 make && 6.30 make DESTDIR=$PWD/_pkg install 6.31 }
7.1 --- a/mISDNuser/stuff/Makefile.u Tue May 12 14:59:16 2009 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,11 +0,0 @@ 7.4 ---- mISDNuser-1_1_7_2/Makefile 7.5 -+++ mISDNuser-1_1_7_2/Makefile 7.6 -@@ -13,7 +13,7 @@ 7.7 - # Change this to create an install prefix for the shared libs, programms and 7.8 - # includes 7.9 - # 7.10 --INSTALL_PREFIX := / 7.11 -+INSTALL_PREFIX := $(DESTDIR) 7.12 - export INSTALL_PREFIX 7.13 - 7.14 - MISDNINCLUDEDIR := $(MISDNDIR)/include