[arch-commits] Commit in fcpcmcia/trunk (3 files)

Tobias Powalowski tpowa at archlinux.org
Wed Aug 4 15:40:34 EDT 2010


    Date: Wednesday, August 4, 2010 @ 15:40:34
  Author: tpowa
Revision: 86808

add patches

Added:
  fcpcmcia/trunk/kernel-2.6.31.patch
  fcpcmcia/trunk/kernel-2.6.35.patch
Modified:
  fcpcmcia/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   41 ++++++++++----------
 kernel-2.6.31.patch |   11 +++++
 kernel-2.6.35.patch |  102 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-04 19:33:22 UTC (rev 86807)
+++ PKGBUILD	2010-08-04 19:40:34 UTC (rev 86808)
@@ -3,17 +3,17 @@
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=51
-_kernver=2.6.34-ARCH
+pkgrel=52
+_kernver=2.6.35-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.34' 'kernel26<2.6.35')
-makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35')
+depends=('capi4k-utils' 'kernel26>=2.6.35' 'kernel26<2.6.36')
+makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36')
 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.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)
  md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
@@ -25,11 +25,12 @@
          'e953a90fe3d08ebbd8736f66902414dc'
          '34f5b78b219de8ce12793b16e0171e87'
          '410f077bbe271e924be6d8b6b5f9540d'
-         '224a7679645a51929f8d5e1f210d7a9e')
+         '224a7679645a51929f8d5e1f210d7a9e'
+         'd2ee9899095c23535f31ba4f2e4759e7')
 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.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)
 md5sums=('4f461710cf57ebf50b3c4f2842288752'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
@@ -41,23 +42,25 @@
          'e953a90fe3d08ebbd8736f66902414dc'
          '34f5b78b219de8ce12793b16e0171e87'
          '410f077bbe271e924be6d8b6b5f9540d'
-         '224a7679645a51929f8d5e1f210d7a9e')
+         '224a7679645a51929f8d5e1f210d7a9e'
+         'd2ee9899095c23535f31ba4f2e4759e7')
 fi
 install=(fcpcmcia.install)
 options=(!makeflags)
 build() {
   cd $srcdir/fritz/src
-  [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch || return 1)
-  patch -Np0 -i ../../pcmcia-2.6.17.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.19.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.20.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.22.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.24.patch || return 1
-  patch -Np2 -i ../../kernel-2.6.27.patch || return 1
-  patch -Np1 -i ../../kernel-2.6.28.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.31.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.33.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.34.patch || return 1
+  [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch)
+  patch -Np0 -i ../../pcmcia-2.6.17.patch
+  patch -Np0 -i ../../kernel-2.6.19.patch
+  patch -Np0 -i ../../kernel-2.6.20.patch
+  patch -Np0 -i ../../kernel-2.6.22.patch
+  patch -Np0 -i ../../kernel-2.6.24.patch
+  patch -Np2 -i ../../kernel-2.6.27.patch
+  patch -Np1 -i ../../kernel-2.6.28.patch
+  patch -Np0 -i ../../kernel-2.6.31.patch
+  patch -Np0 -i ../../kernel-2.6.33.patch
+  patch -Np0 -i ../../kernel-2.6.34.patch
+  patch -Np0 -i ../../kernel-2.6.35.patch
 
   cd ..
   # fix from Karsten Keil <kkeil at suse.de>

Added: kernel-2.6.31.patch
===================================================================
--- kernel-2.6.31.patch	                        (rev 0)
+++ kernel-2.6.31.patch	2010-08-04 19:40:34 UTC (rev 86808)
@@ -0,0 +1,11 @@
+--- driver.c~	2009-09-10 16:21:39.000000000 +0200
++++ driver.c	2009-09-10 16:21:39.000000000 +0200
+@@ -569,7 +569,7 @@
+ 		}
+ 	}
+ 	stop (card);
+-	capi_ctr_reseted (ctrl);
++	capi_ctr_down (ctrl);
+ #if defined (__fcpnp__)
+ 	pnp_disable_dev (card->dev);
+ #endif

Added: kernel-2.6.35.patch
===================================================================
--- kernel-2.6.35.patch	                        (rev 0)
+++ kernel-2.6.35.patch	2010-08-04 19:40:34 UTC (rev 86808)
@@ -0,0 +1,102 @@
+--- fcpcmcia_cs.c~	2010-08-04 13:02:02.150001261 +0200
++++ fcpcmcia_cs.c	2010-08-04 13:02:02.176667927 +0200
+@@ -121,33 +121,6 @@
+ 
+ static void cs_detach(struct pcmcia_device *p_dev);
+ 
+-
+-/*
+-   A linked list of "instances" of the skeleton device.  Each actual
+-   PCMCIA card corresponds to one device instance, and is described
+-   by one struct pcmcia_device structure (defined in ds.h).
+-
+-   You may not want to use a linked list for this -- for example, the
+-   memory card driver uses an array of struct pcmcia_device pointers, where minor
+-   device numbers are used to derive the corresponding array index.
+-*/
+-
+-
+-/*
+-   A driver needs to provide a dev_node_t structure for each device
+-   on a card.  In some cases, there is only one device per card (for
+-   example, ethernet cards, modems).  In other cases, there may be
+-   many actual or logical devices (SCSI adapters, memory cards with
+-   multiple partitions).  The dev_node_t structures need to be kept
+-   in a linked list starting at the 'dev' field of a struct pcmcia_device
+-   structure.  We allocate them in the card's private data structure,
+-   because they generally can't be allocated dynamically.
+-*/
+-   
+-typedef struct local_info_t {
+-    dev_node_t	node;
+-} local_info_t;
+-
+ /*======================================================================
+ 
+     cs_attach() creates an "instance" of the driver, allocating
+@@ -162,7 +135,6 @@
+ 
+ static int cs_probe(struct pcmcia_device *p_dev)
+ {
+-    local_info_t *local;
+ #if defined (PCMCIA_IRQ_INFO2)
+     int i;
+ #endif
+@@ -194,11 +166,6 @@
+     p_dev->conf.ConfigIndex = 1;
+     p_dev->conf.Present = PRESENT_OPTION;
+ 
+-    /* Allocate space for private device-specific data */
+-    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
+-    if (!local)
+-        goto err_kfree;
+-    p_dev->priv = local;
+     return cs_config(p_dev);
+ 
+  err_kfree:
+@@ -249,10 +216,8 @@
+ 
+ static int cs_config(struct pcmcia_device *link)
+ {
+-    local_info_t *dev;
+     int i;
+     char devname[128];
+-    dev = link->priv;
+ 
+     devname[0] = 0;
+     if (link->prod_id[1])
+@@ -283,14 +248,6 @@
+ 
+     } while (0);
+ 
+-    /* At this point, the dev_node_t structure(s) should be
+-       initialized and arranged in a linked list at link->dev. */
+-
+-    strcpy(dev->node.dev_name, "A1");
+-    dev->node.major = 64;
+-    dev->node.minor = 0;
+-
+-    link->dev_node = &dev->node;
+     /* If any step failed, release any partially configured state */
+     if (i != 0) {
+         ERROR("Failed to setup controller, releasing link...\n");
+@@ -309,7 +266,7 @@
+ 	cs_release(link);
+ 	return -ENODEV;
+     }
+-    dev->node.minor = i;
++    link->priv = (void *) (unsigned long) i;
+ 
+     NOTE(
+ 	"Card driver for '%s' has been set up: i/o %x, irq %d\n", 
+--- fcpcmcia_cs.c~	2010-08-04 13:13:33.610000837 +0200
++++ fcpcmcia_cs.c	2010-08-04 13:13:33.633334616 +0200
+@@ -165,8 +165,6 @@
+ 
+     return cs_config(p_dev);
+ 
+- err_kfree:
+-    return -ENOMEM;
+ } /* cs_attach */
+ 
+ /*======================================================================



More information about the arch-commits mailing list