[arch-commits] Commit in fcpcmcia/trunk (3 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Nov 1 10:06:52 UTC 2010
Date: Monday, November 1, 2010 @ 06:06:52
Author: tpowa
Revision: 97692
upgpkg: fcpcmcia 31107-54
bump to .36 kernel series
Added:
fcpcmcia/trunk/kernel-2.6.36.patch
Modified:
fcpcmcia/trunk/PKGBUILD
fcpcmcia/trunk/fcpcmcia.install
---------------------+
PKGBUILD | 44 ++++++++++++++++++++++-------
fcpcmcia.install | 4 +-
kernel-2.6.36.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-01 09:39:17 UTC (rev 97691)
+++ PKGBUILD 2010-11-01 10:06:52 UTC (rev 97692)
@@ -3,17 +3,27 @@
pkgname=fcpcmcia
pkgver=31107
-pkgrel=53
-_kernver=2.6.35-ARCH
+pkgrel=54
+_kernver=2.6.36-ARCH
pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel"
arch=(i686 x86_64)
license=('custom:"AVM"' 'LPGL')
url="http://www.avm.de"
-depends=('capi4k-utils' 'kernel26>=2.6.35' 'kernel26<2.6.36')
-makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36')
+depends=('capi4k-utils' 'kernel26>=2.6.36' 'kernel26<2.6.37')
+makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
if [ "$CARCH" = "i686" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz
- pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\
- kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch)
+ pcmcia-2.6.17.patch
+ atomic.patch kernel-2.6.19.patch
+ kernel-2.6.20.patch
+ kernel-2.6.22.patch
+ kernel-2.6.24.patch
+ kernel-2.6.27.patch
+ kernel-2.6.28.patch
+ kernel-2.6.31.patch
+ kernel-2.6.33.patch
+ kernel-2.6.34.patch
+ kernel-2.6.35.patch
+ kernel-2.6.36.patch)
md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -26,11 +36,23 @@
'34f5b78b219de8ce12793b16e0171e87'
'410f077bbe271e924be6d8b6b5f9540d'
'224a7679645a51929f8d5e1f210d7a9e'
- '3a8dcddd077fc301a23a038d5f0aa11f')
+ '3a8dcddd077fc301a23a038d5f0aa11f'
+ '21ccb623540d866091eb918a3d5b2358')
fi
if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz
- pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\
- kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch)
+ pcmcia-2.6.17.patch
+ atomic.patch
+ kernel-2.6.19.patch
+ kernel-2.6.20.patch
+ kernel-2.6.22.patch
+ kernel-2.6.24.patch
+ kernel-2.6.27.patch
+ kernel-2.6.28.patch
+ kernel-2.6.31.patch
+ kernel-2.6.33.patch
+ kernel-2.6.34.patch
+ kernel-2.6.35.patch
+ kernel-2.6.36.patch)
md5sums=('4f461710cf57ebf50b3c4f2842288752'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -43,7 +65,8 @@
'34f5b78b219de8ce12793b16e0171e87'
'410f077bbe271e924be6d8b6b5f9540d'
'224a7679645a51929f8d5e1f210d7a9e'
- '3a8dcddd077fc301a23a038d5f0aa11f')
+ '3a8dcddd077fc301a23a038d5f0aa11f'
+ '21ccb623540d866091eb918a3d5b2358')
fi
install=(fcpcmcia.install)
options=(!makeflags)
@@ -61,6 +84,7 @@
patch -Np0 -i ../../kernel-2.6.33.patch
patch -Np0 -i ../../kernel-2.6.34.patch
patch -Np0 -i ../../kernel-2.6.35.patch
+ patch -Np0 -i ../../kernel-2.6.36.patch
cd ..
# fix from Karsten Keil <kkeil at suse.de>
Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install 2010-11-01 09:39:17 UTC (rev 97691)
+++ fcpcmcia.install 2010-11-01 10:06:52 UTC (rev 97692)
@@ -9,7 +9,7 @@
sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.35-ARCH
+ KERNEL_VERSION=2.6.36-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
@@ -24,7 +24,7 @@
sed -i -e 's/fcpcmcia - - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.35-ARCH
+ KERNEL_VERSION=2.6.36-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
Added: kernel-2.6.36.patch
===================================================================
--- kernel-2.6.36.patch (rev 0)
+++ kernel-2.6.36.patch 2010-11-01 10:06:52 UTC (rev 97692)
@@ -0,0 +1,74 @@
+--- fcpcmcia_cs.c~ 2010-10-25 22:10:05.546667655 +0200
++++ fcpcmcia_cs.c 2010-10-25 22:10:15.926667655 +0200
+@@ -26,7 +26,6 @@
+ #include <asm/io.h>
+ #include <asm/system.h>
+
+-#include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+ #include <pcmcia/cistpl.h>
+ #include <pcmcia/ciscode.h>
+--- fcpcmcia_cs.c~ 2010-11-01 10:57:33.946670710 +0100
++++ fcpcmcia_cs.c 2010-11-01 10:57:33.980004044 +0100
+@@ -141,9 +141,8 @@
+ NOTE("Attaching device...\n");
+
+ /* The io structure describes IO port mapping */
+- p_dev->io.NumPorts1 = 16;
+- p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+- p_dev->io.NumPorts2 = 0;
++ p_dev->resource[0]->end = 16;
++ p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+
+ #if defined (PCMCIA_IRQ_INFO2)
+ p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+@@ -199,13 +198,9 @@
+ if (cf->io.nwin <= 0)
+ return -ENODEV;
+
+- p_dev->io.BasePort1 = cf->io.win[0].base;
+- p_dev->io.NumPorts1 = cf->io.win[0].len;
+- p_dev->io.NumPorts2 = 0;
+- printk(KERN_INFO "fcpcmcia_cs: testing i/o %#x-%#x\n",
+- p_dev->io.BasePort1,
+- p_dev->io.BasePort1+p_dev->io.NumPorts1-1);
+- return pcmcia_request_io(p_dev, &p_dev->io);
++ p_dev->resource[0]->start = cf->io.win[0].base;
++ p_dev->resource[0]->end = cf->io.win[0].len;
++ return pcmcia_request_io(p_dev);
+ }
+
+ static int cs_config(struct pcmcia_device *link)
+@@ -249,10 +244,10 @@
+ }
+ NOTE("Ready to call card driver for '%s'...\n", devname);
+
+- if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq)) < 0) {
++ if ((i = fcpcmcia_addcard(link->resource[0]->start, link->irq)) < 0) {
+ ERROR(
+ "Failed to add AVM-%s-Controller at i/o %x, irq %d\n",
+- link->io.BasePort1,
++ (unsigned int) link->resource[0]->start,
+ link->irq
+ );
+ cs_release(link);
+@@ -279,7 +274,7 @@
+
+ static void cs_release(struct pcmcia_device *link)
+ {
+- fcpcmcia_delcard(link->io.BasePort1, link->irq);
++ fcpcmcia_delcard(link->resource[0]->start, link->irq);
+
+ pcmcia_disable_device(link);
+ } /* cs_release */
+--- fcpcmcia_cs.c~ 2010-11-01 11:07:48.023337378 +0100
++++ fcpcmcia_cs.c 2010-11-01 11:07:48.053337378 +0100
+@@ -258,7 +258,7 @@
+ NOTE(
+ "Card driver for '%s' has been set up: i/o %x, irq %d\n",
+ devname,
+- link->io.BasePort1,
++ (unsigned int) link->resource[0]->start,
+ link->irq
+ );
+ return 0;
More information about the arch-commits
mailing list