[arch-commits] CVS update of extra/network/fcpcmcia-ck (7 files)
Tom Killian
tom at archlinux.org
Sat Oct 13 21:34:44 UTC 2007
Date: Saturday, October 13, 2007 @ 17:34:44
Author: tom
Path: /home/cvs-extra/extra/network/fcpcmcia-ck
Removed: PKGBUILD (1.7) atomic.patch (1.1) fcpcmcia.install (1.3)
kernel-2.6.19.patch (1.1) kernel-2.6.20.patch (1.1)
kernel-2.6.22.patch (1.1) pcmcia-2.6.17.patch (1.1)
kernel26ck removed
---------------------+
PKGBUILD | 32 ---
atomic.patch | 18 -
fcpcmcia.install | 33 ---
kernel-2.6.19.patch | 20 --
kernel-2.6.20.patch | 55 -----
kernel-2.6.22.patch | 11 -
pcmcia-2.6.17.patch | 486 --------------------------------------------------
7 files changed, 655 deletions(-)
Index: extra/network/fcpcmcia-ck/PKGBUILD
diff -u extra/network/fcpcmcia-ck/PKGBUILD:1.7 extra/network/fcpcmcia-ck/PKGBUILD:removed
--- extra/network/fcpcmcia-ck/PKGBUILD:1.7 Mon Aug 20 06:09:43 2007
+++ extra/network/fcpcmcia-ck/PKGBUILD Sat Oct 13 17:34:44 2007
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD,v 1.7 2007/08/20 10:09:43 tom Exp $
-#Maintainer: Tobias Powalowski <t.powa at gmx.de>
-
-
-
-pkgname=fcpcmcia-ck
-pkgver=31107
-pkgrel=7
-_kernver=2.6.22-ck
-pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For kernel26ck"
-arch=(i686 x86_64)
-license=('custom:"AVM"' 'LPGL')
-url="http://www.avm.de"
-depends=('capi4k-utils' 'kernel26ck')
-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)
-install=(fcpcmcia.install)
-build() {
- cd $startdir/src/fritz/src
- 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
- cd $startdir/src/fritz
- make KDIR=/lib/modules/${_kernver}/build LIBDIR=$startdir/pkg/var/lib/fritz all || return 1
- mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- cp $startdir/src/fritz/src/fcpcmcia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- cp $startdir/src/fritz/src/fcpcmcia_cs.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- rm -r $startdir/pkg/var/lib/fritz
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
-}
Index: extra/network/fcpcmcia-ck/atomic.patch
diff -u extra/network/fcpcmcia-ck/atomic.patch:1.1 extra/network/fcpcmcia-ck/atomic.patch:removed
--- extra/network/fcpcmcia-ck/atomic.patch:1.1 Sun Oct 8 15:29:31 2006
+++ extra/network/fcpcmcia-ck/atomic.patch Sat Oct 13 17:34:45 2007
@@ -1,18 +0,0 @@
---- tools.h 2005-07-07 00:00:00.000000000 +0200
-+++ tools.h~ 2006-03-13 08:27:07.000000000 +0100
-@@ -69,14 +69,7 @@
- extern void lprintf (const char *, const char *, ...);
- extern void vlprintf (const char *, const char *, va_list);
-
--/*---------------------------------------------------------------------------*\
--\*---------------------------------------------------------------------------*/
--static inline unsigned long atomic_xchg (
-- volatile atomic_t * v,
-- unsigned value
--) {
-- return __xchg (value, &v->counter, sizeof (unsigned));
--} /* atomic_xchg */
-+
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
Index: extra/network/fcpcmcia-ck/fcpcmcia.install
diff -u extra/network/fcpcmcia-ck/fcpcmcia.install:1.3 extra/network/fcpcmcia-ck/fcpcmcia.install:removed
--- extra/network/fcpcmcia-ck/fcpcmcia.install:1.3 Tue Jul 24 05:23:17 2007
+++ extra/network/fcpcmcia-ck/fcpcmcia.install Sat Oct 13 17:34:45 2007
@@ -1,33 +0,0 @@
- # arg 1: the new package version
-post_install() {
-cat << EOF
-==> Add 'capiinit' to rc.conf daemons list.
-==> WARNING:
-==> Do not try to reinsert card after modules have been loaded it will crash kernel!
-==> Unload fcpcmcia_cs and fcpmcia first, after eject!
-EOF
- sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
- sed -i -e 's/fcpcmcia - - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
Index: extra/network/fcpcmcia-ck/kernel-2.6.19.patch
diff -u extra/network/fcpcmcia-ck/kernel-2.6.19.patch:1.1 extra/network/fcpcmcia-ck/kernel-2.6.19.patch:removed
--- extra/network/fcpcmcia-ck/kernel-2.6.19.patch:1.1 Sat Dec 9 16:41:01 2006
+++ extra/network/fcpcmcia-ck/kernel-2.6.19.patch Sat Oct 13 17:34:45 2007
@@ -1,20 +0,0 @@
---- main.c~ 2005-07-07 00:00:00.000000000 +0200
-+++ main.c 2006-10-17 14:56:59.000000000 +0200
-@@ -22,7 +22,6 @@
-
- #include <stdarg.h>
- #include <asm/uaccess.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
---- driver.h~ 2005-07-07 00:00:00.000000000 +0200
-+++ driver.h 2006-10-17 15:00:26.000000000 +0200
-@@ -23,7 +23,6 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
-
--#include <linux/config.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/list.h>
Index: extra/network/fcpcmcia-ck/kernel-2.6.20.patch
diff -u extra/network/fcpcmcia-ck/kernel-2.6.20.patch:1.1 extra/network/fcpcmcia-ck/kernel-2.6.20.patch:removed
--- extra/network/fcpcmcia-ck/kernel-2.6.20.patch:1.1 Sat Feb 17 08:52:47 2007
+++ extra/network/fcpcmcia-ck/kernel-2.6.20.patch Sat Oct 13 17:34:45 2007
@@ -1,55 +0,0 @@
---- driver.c~ 2005-07-07 00:00:00.000000000 +0200
-+++ driver.c 2007-01-08 22:33:51.000000000 +0100
-@@ -901,10 +901,10 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_init (void) {
-
- return (NULL != (capi_lib = link_library (NULL)));
--} /* driver_init */
-+} /* avm_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
---- main.c~ 2007-01-08 22:18:57.000000000 +0100
-+++ main.c 2007-01-08 22:34:33.000000000 +0100
-@@ -204,7 +204,7 @@
- NOTE(PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
-
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_init ()) {
- ERROR("Error: Driver library not available.\n");
- ERROR("Not loaded.\n");
- return res;
-@@ -269,7 +269,7 @@
- NOTE (PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
-
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_init ()) {
- ERROR("Error: Driver library not available.\n");
- ERROR("Not loaded.\n");
- return -EBUSY;
-@@ -377,7 +377,7 @@
- }
- return err;
- #elif defined (__fcpcmcia__) || defined (__fcclassic__)
-- if (!driver_init ()) {
-+ if (!avm_init ()) {
- ERROR("Error: Driver library not available.\n");
- ERROR("Not loaded.\n");
- return -EBUSY;
---- driver.h~ 2007-01-08 22:18:57.000000000 +0100
-+++ driver.h 2007-01-08 22:34:12.000000000 +0100
-@@ -97,7 +97,7 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
-+extern int avm_init (void);
- extern void driver_exit (void);
-
- /*---------------------------------------------------------------------------*\
Index: extra/network/fcpcmcia-ck/kernel-2.6.22.patch
diff -u extra/network/fcpcmcia-ck/kernel-2.6.22.patch:1.1 extra/network/fcpcmcia-ck/kernel-2.6.22.patch:removed
--- extra/network/fcpcmcia-ck/kernel-2.6.22.patch:1.1 Tue Jul 24 05:23:17 2007
+++ extra/network/fcpcmcia-ck/kernel-2.6.22.patch Sat Oct 13 17:34:45 2007
@@ -1,11 +0,0 @@
---- main.c~ 2005-07-07 00:00:00.000000000 +0200
-+++ main.c 2007-06-09 18:41:07.000000000 +0200
-@@ -364,7 +364,7 @@
- #endif
-
- #if defined (__fcpci__)
-- if (0 == (err = pci_module_init (&fcpci_driver))) {
-+ if (0 == (err = pci_register_driver (&fcpci_driver))) {
- LOG("PCI driver registered.\n");
- register_capi_driver (&fritz_capi_driver);
- LOG("CAPI driver registered.\n");
Index: extra/network/fcpcmcia-ck/pcmcia-2.6.17.patch
diff -u extra/network/fcpcmcia-ck/pcmcia-2.6.17.patch:1.1 extra/network/fcpcmcia-ck/pcmcia-2.6.17.patch:removed
--- extra/network/fcpcmcia-ck/pcmcia-2.6.17.patch:1.1 Sun Oct 8 15:29:31 2006
+++ extra/network/fcpcmcia-ck/pcmcia-2.6.17.patch Sat Oct 13 17:34:45 2007
@@ -1,486 +0,0 @@
---- fcpcmcia_cs.c~ 2005-07-07 00:00:00.000000000 +0200
-+++ fcpcmcia_cs.c 2006-04-09 17:27:52.000000000 +0200
-@@ -110,9 +110,9 @@
- handler.
- */
-
--static void cs_config(dev_link_t *);
--static void cs_release(dev_link_t *);
--static int cs_event(event_t event, int priority, event_callback_args_t *);
-+static int cs_config(struct pcmcia_device *link);
-+static void cs_release(struct pcmcia_device *link);
-+
-
- /*
- The attach() and detach() entry points are used to create and destroy
-@@ -120,42 +120,27 @@
- needed to manage one actual PCMCIA card.
- */
-
--static dev_link_t * cs_attach(void);
--static void cs_detach(dev_link_t *);
-+static void cs_detach(struct pcmcia_device *p_dev);
-
--/*
-- The dev_info variable is the "key" that is used to match up this
-- device driver with appropriate cards, through the card configuration
-- database.
--*/
--
--static dev_info_t dev_info = "fcpcmcia_cs";
-
- /*
- A linked list of "instances" of the skeleton device. Each actual
- PCMCIA card corresponds to one device instance, and is described
-- by one dev_link_t structure (defined in ds.h).
-+ 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 dev_link_t pointers, where minor
-+ memory card driver uses an array of struct pcmcia_device pointers, where minor
- device numbers are used to derive the corresponding array index.
- */
-
--static dev_link_t *dev_list = NULL;
-
- /*
-- A dev_link_t structure has fields for most things that are needed
-- to keep track of a socket, but there will usually be some device
-- specific information that also needs to be kept track of. The
-- 'priv' pointer in a dev_link_t structure can be used to point to
-- a device-specific private data structure, like this.
--
- 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 dev_link_t
-+ 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.
- */
-@@ -176,83 +161,52 @@
-
- ======================================================================*/
-
--static dev_link_t *cs_attach(void)
-+static int cs_probe(struct pcmcia_device *p_dev)
- {
-- client_reg_t client_reg;
-- dev_link_t *link;
- local_info_t *local;
-- int ret;
- #if defined (PCMCIA_IRQ_INFO2)
- int i;
- #endif
-
- NOTE("Attaching device...\n");
-
-- /* Initialize the dev_link_t structure */
-- link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-- if (!link)
-- goto err;
-- memset(link, 0, sizeof(struct dev_link_t));
--
- /* The io structure describes IO port mapping */
-- link->io.NumPorts1 = 16;
-- link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-- link->io.NumPorts2 = 0;
-+ p_dev->io.NumPorts1 = 16;
-+ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-+ p_dev->io.NumPorts2 = 0;
-
- /* Interrupt setup */
-- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
-+ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
-
- #if defined (PCMCIA_IRQ_INFO2)
-- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
-+ p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
- if (irq_list_count > 0) {
- for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++)
-- link->irq.IRQInfo2 |= 1 << irq_list[i];
-+ p_dev->irq.IRQInfo2 |= 1 << irq_list[i];
- } else {
- for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
-- link->irq.IRQInfo2 |= 1 << default_irq_list[i];
-+ p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i];
- }
- #else
-- link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-+ p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
- #endif
-
- /* General socket configuration */
-- link->conf.Attributes = CONF_ENABLE_IRQ;
-- link->conf.Vcc = 50;
-- link->conf.IntType = INT_MEMORY_AND_IO;
-- link->conf.ConfigIndex = 1;
-- link->conf.Present = PRESENT_OPTION;
-+ p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-+ p_dev->conf.IntType = INT_MEMORY_AND_IO;
-+ p_dev->conf.ConfigIndex = 1;
-+ p_dev->conf.Present = PRESENT_OPTION;
-
- /* Allocate space for private device-specific data */
- local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
- if (!local)
- goto err_kfree;
- memset(local, 0, sizeof(local_info_t));
-- link->priv = local;
--
-- /* Register with Card Services */
-- link->next = dev_list;
-- dev_list = link;
-- client_reg.dev_info = &dev_info;
-- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
-- client_reg.EventMask =
-- CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-- CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-- CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-- client_reg.event_handler = &cs_event;
-- client_reg.Version = 0x0210;
-- client_reg.event_callback_args.client_data = link;
-- ret = pcmcia_register_client(&link->handle, &client_reg);
-- if (ret != 0) {
-- cs_error(link->handle, RegisterClient, ret);
-- cs_detach(link);
-- goto err;
-- }
-- return link;
-+ p_dev->priv = local;
-+ return cs_config(p_dev);
-
- err_kfree:
-- kfree(link);
-- err:
-- return NULL;
-+ return -ENOMEM;
- } /* cs_attach */
-
- /*======================================================================
-@@ -264,39 +218,10 @@
-
- ======================================================================*/
-
--static void cs_detach(dev_link_t *link)
-+static void cs_detach(struct pcmcia_device *link)
- {
-- dev_link_t **linkp;
--
-- NOTE("Detaching device...\n");
--
-- /* Locate device structure */
-- for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-- if (*linkp == link) break;
-- if (*linkp == NULL)
-- return;
--
-- /*
-- If the device is currently configured and active, we won't
-- actually delete it yet. Instead, it is marked so that when
-- the release() function is called, that will trigger a proper
-- detach().
-- */
-- if (link->state & DEV_CONFIG) {
-- link->state |= DEV_STALE_LINK;
-- return;
-- }
--
-- /* Break the link with Card Services */
-- if (link->handle)
-- pcmcia_deregister_client(link->handle);
--
-- /* Unlink device structure, free pieces */
-- *linkp = link->next;
-- if (link->priv) {
-- kfree(link->priv);
-- }
-- kfree(link);
-+ cs_release(link);
-+ kfree(link->priv);
-
- } /* cs_detach */
-
-@@ -308,14 +234,15 @@
-
- ======================================================================*/
-
--static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
-+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-+ cisparse_t *parse)
- {
- int i = pcmcia_get_tuple_data(handle, tuple);
- if (i != CS_SUCCESS) return i;
- return pcmcia_parse_tuple(handle, tuple, parse);
- }
-
--static int first_tuple(client_handle_t handle, tuple_t *tuple,
-+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- cisparse_t *parse)
- {
- int i = pcmcia_get_first_tuple(handle, tuple);
-@@ -323,7 +250,7 @@
- return get_tuple(handle, tuple, parse);
- }
-
--static int next_tuple(client_handle_t handle, tuple_t *tuple,
-+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- cisparse_t *parse)
- {
- int i = pcmcia_get_next_tuple(handle, tuple);
-@@ -331,9 +258,8 @@
- return get_tuple(handle, tuple, parse);
- }
-
--static void cs_config(dev_link_t *link)
-+static int cs_config(struct pcmcia_device *link)
- {
-- client_handle_t handle;
- tuple_t tuple;
- cisparse_t parse;
- cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-@@ -341,7 +267,6 @@
- int i;
- u_char buf[64];
- char devname[128];
-- handle = link->handle;
- dev = link->priv;
-
- /*
-@@ -350,25 +275,21 @@
- */
- do {
- tuple.DesiredTuple = CISTPL_CONFIG;
-- i = pcmcia_get_first_tuple(handle, &tuple);
-+ i = pcmcia_get_first_tuple(link, &tuple);
- if (i != CS_SUCCESS) break;
- tuple.TupleData = buf;
- tuple.TupleDataMax = 64;
- tuple.TupleOffset = 0;
-- i = pcmcia_get_tuple_data(handle, &tuple);
-+ i = pcmcia_get_tuple_data(link, &tuple);
- if (i != CS_SUCCESS) break;
-- i = pcmcia_parse_tuple(handle, &tuple, &parse);
-+ i = pcmcia_parse_tuple(link, &tuple, &parse);
- if (i != CS_SUCCESS) break;
- link->conf.ConfigBase = parse.config.base;
- } while (0);
- if (i != CS_SUCCESS) {
-- cs_error(link->handle, ParseTuple, i);
-- link->state &= ~DEV_CONFIG_PENDING;
-- return;
-+ cs_error(link, ParseTuple, i);
-+ return -ENODEV;
- }
--
-- /* Configure card */
-- link->state |= DEV_CONFIG;
-
- do {
-
-@@ -379,7 +300,7 @@
- tuple.DesiredTuple = CISTPL_VERS_1;
-
- devname[0] = 0;
-- if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) {
-+ if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) {
- strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1],
- sizeof(devname));
- }
-@@ -390,7 +311,7 @@
- tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
- tuple.Attributes = 0;
- tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-- i = first_tuple(handle, &tuple, &parse);
-+ i = first_tuple(link, &tuple, &parse);
- while (i == CS_SUCCESS) {
- if (cf->io.nwin > 0) {
- link->conf.ConfigIndex = cf->index;
-@@ -400,36 +321,36 @@
- NOTE("testing i/o %#x-%#x\n",
- link->io.BasePort1,
- link->io.BasePort1+link->io.NumPorts1-1);
-- i = pcmcia_request_io(link->handle, &link->io);
-+ i = pcmcia_request_io(link, &link->io);
- if (i == CS_SUCCESS) goto found_port;
- }
-- i = next_tuple(handle, &tuple, &parse);
-+ i = next_tuple(link, &tuple, &parse);
- }
-
- found_port:
- if (i != CS_SUCCESS) {
-- cs_error(link->handle, RequestIO, i);
-+ cs_error(link, RequestIO, i);
- break;
- }
-
- /*
- * allocate an interrupt line
- */
-- i = pcmcia_request_irq(link->handle, &link->irq);
-+ i = pcmcia_request_irq(link, &link->irq);
- if (i != CS_SUCCESS) {
-- cs_error(link->handle, RequestIRQ, i);
-- pcmcia_release_io(link->handle, &link->io);
-+ cs_error(link, RequestIRQ, i);
-+ /* undo */
-+ pcmcia_disable_device(link);
- break;
- }
-
- /*
- * configure the PCMCIA socket
- */
-- i = pcmcia_request_configuration(link->handle, &link->conf);
-+ i = pcmcia_request_configuration(link, &link->conf);
- if (i != CS_SUCCESS) {
-- cs_error(link->handle, RequestConfiguration, i);
-- pcmcia_release_io(link->handle, &link->io);
-- pcmcia_release_irq(link->handle, &link->irq);
-+ cs_error(link, RequestConfiguration, i);
-+ pcmcia_disable_device(link);
- break;
- }
-
-@@ -441,14 +362,13 @@
- strcpy(dev->node.dev_name, "A1");
- dev->node.major = 64;
- dev->node.minor = 0;
-- link->dev = &dev->node;
--
-- link->state &= ~DEV_CONFIG_PENDING;
-+
-+ 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");
- cs_release(link);
-- return;
-+ return -ENODEV;
- }
- NOTE("Ready to call card driver for '%s'...\n", devname);
-
-@@ -460,7 +380,7 @@
- link->irq.AssignedIRQ
- );
- cs_release(link);
-- return;
-+ return -ENODEV;
- }
- dev->node.minor = i;
-
-@@ -470,6 +390,7 @@
- link->io.BasePort1,
- link->irq.AssignedIRQ
- );
-+ return 0;
- } /* cs_config */
-
- /*======================================================================
-@@ -480,78 +401,29 @@
-
- ======================================================================*/
-
--static void cs_release(dev_link_t *link)
-+static void cs_release(struct pcmcia_device *link)
- {
- fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ);
-
-- /* Unlink the device chain */
-- link->dev = NULL;
--
-- /* Don't bother checking to see if these succeed or not */
-- pcmcia_release_configuration(link->handle);
-- pcmcia_release_io(link->handle, &link->io);
-- pcmcia_release_irq(link->handle, &link->irq);
-- link->state &= ~DEV_CONFIG;
--
-- if (link->state & DEV_STALE_LINK)
-- cs_detach(link);
--
-+ pcmcia_disable_device(link);
- } /* cs_release */
-
--/*======================================================================
--
-- The card status event handler. Mostly, this schedules other
-- stuff to run after an event is received. A CARD_REMOVAL event
-- also sets some flags to discourage the net drivers from trying
-- to talk to the card any more.
--
-- When a CARD_REMOVAL event is received, we immediately set a flag
-- to block future accesses to this device. All the functions that
-- actually access the device should check this flag to make sure
-- the card is still present.
--
--======================================================================*/
--
--static int cs_event(event_t event, int priority, event_callback_args_t *args)
--{
-- dev_link_t *link = args->client_data;
--
-- LOG("Card service event: %x\n", event);
-- switch (event) {
-- case CS_EVENT_CARD_REMOVAL:
-- link->state &= ~DEV_PRESENT;
-- if (link->state & DEV_CONFIG)
-- cs_release(link);
-- break;
-- case CS_EVENT_CARD_INSERTION:
-- link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-- cs_config(link);
-- break;
-- case CS_EVENT_PM_SUSPEND:
-- link->state |= DEV_SUSPEND;
-- /* Fall through... */
-- case CS_EVENT_RESET_PHYSICAL:
-- if (link->state & DEV_CONFIG)
-- pcmcia_release_configuration(link->handle);
-- break;
-- case CS_EVENT_PM_RESUME:
-- link->state &= ~DEV_SUSPEND;
-- /* Fall through... */
-- case CS_EVENT_CARD_RESET:
-- if (link->state & DEV_CONFIG)
-- pcmcia_request_configuration(link->handle, &link->conf);
-- break;
-- }
-- return 0;
--} /* cs_event */
-+static struct pcmcia_device_id fcpcmcia_ids[] = {
-+ PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb),
-+ PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b),
-+ PCMCIA_DEVICE_NULL
-+};
-+MODULE_DEVICE_TABLE(pcmcia, fcpcmcia_ids);
-
- static struct pcmcia_driver cs_driver = {
- .owner = THIS_MODULE,
- .drv = {
- .name = "fcpcmcia_cs",
- },
-- .attach = cs_attach,
-- .detach = cs_detach,
-+ .probe = cs_probe,
-+ .remove = cs_detach,
-+ .id_table = fcpcmcia_ids,
-+
- };
-
- static int __init cs_init(void)
-@@ -563,12 +435,6 @@
- {
- pcmcia_unregister_driver(&cs_driver);
-
-- /* XXX: this really needs to move into generic code.. */
-- while (dev_list != NULL) {
-- if (dev_list->state & DEV_CONFIG)
-- cs_release(dev_list);
-- cs_detach(dev_list);
-- }
- }
-
- module_init(cs_init);
More information about the arch-commits
mailing list