On Thu, Dec 07, 2006 at 02:53:12PM +0100, Christian Kuehn wrote:
Moin,
die 10.2 ist ja gaaaanz frisch raus, wohl wieder ohne die Treiber für die
AVM-Karten.
Gibts schon Ideen, wann es die RPMs dazu geben wird?
Easy Linux bereitet eine DVD mit den Treibern vor, es gab für einige DSL
Controller eine neue ADSL2+ DSLAM kompatible Firmware, sonst ist alles
gleichgeblieben.
Auch der Millin Verlag bringt eine AddOn Version heraus, die die Treiber
enthält.
Eine Aenderung war doch noch notwendig, bei der Fritz!Card PCMCIA da musste
der CardService Treiber angepasst werden, notwendiger Patch (Austausch des
fcpcmcia.diff der 10.1 Version) ist hier:
Index: fritz/src/fcpcmcia_cs.c
===================================================================
--- fritz.orig/src/fcpcmcia_cs.c
+++ fritz/src/fcpcmcia_cs.c
@@ -43,10 +43,6 @@
#include
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-#define PCMCIA_IRQ_INFO2
-#endif
-
/*====================================================================*/
MODULE_LICENSE("GPL");
@@ -77,23 +73,6 @@ static void cs_msg(int error, const char
printk("%s%s%s: %s",(error?KERN_ERR:KERN_INFO),MODNAME,(error?" ERROR":""),sbuf);
} /* msg */
-/*====================================================================*/
-
-#if defined (PCMCIA_IRQ_INFO2)
-/* Parameters that can be set with 'insmod' */
-
-/* This means pick from 15, 12, 11, 10, 9, 7, 5, 4, and 3 */
-static int default_irq_list[10] = { 15, 12, 11, 10, 9, 7, 5, 4, 3, -1 };
-static int irq_list_count = -1;
-static int irq_list[10];
-
-module_param_array (irq_list, int, irq_list_count, 0);
-
-MODULE_PARM_DESC (irq_list, "List of IRQ numbers");
-#endif
-
-/*====================================================================*/
-
/*
Entry points into the card driver.
*/
@@ -110,39 +89,10 @@ extern int fcpcmcia_delcard (unsigned in
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 *);
-
-/*
- The attach() and detach() entry points are used to create and destroy
- "instances" of the driver, where each instance represents everything
- needed to manage one actual PCMCIA card.
-*/
-
-static dev_link_t * cs_attach(void);
-static void cs_detach(dev_link_t *);
-
-/*
- 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).
-
- 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
- device numbers are used to derive the corresponding array index.
-*/
-
-static dev_link_t *dev_list = NULL;
-
+static int cs_config(struct pcmcia_device *);
+static void cs_release(struct pcmcia_device *);
+static void cs_detach(struct pcmcia_device *p_dev);
+static int cs_probe(struct pcmcia_device *p_dev);
/*
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
@@ -166,7 +116,7 @@ typedef struct local_info_t {
/*======================================================================
- cs_attach() creates an "instance" of the driver, allocating
+ cs_probe() creates an "instance" of the driver, allocating
local data structures for one device. The device is registered
with Card Services.
@@ -176,84 +126,31 @@ typedef struct local_info_t {
======================================================================*/
-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;
-
- /* Interrupt setup */
- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
-
-#if defined (PCMCIA_IRQ_INFO2)
- link->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];
- } else {
- for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
- link->irq.IRQInfo2 |= 1 << default_irq_list[i];
- }
-#else
- link->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;
-
/* Allocate space for private device-specific data */
local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
if (!local)
- goto err_kfree;
+ return -ENOMEM;
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;
-
- err_kfree:
- kfree(link);
- err:
- return NULL;
-} /* cs_attach */
+ p_dev->priv = local;
+ p_dev->io.NumPorts1 = 16;
+ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+ p_dev->io.NumPorts2 = 16;
+ p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_16;
+ p_dev->io.IOAddrLines = 5;
+ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+ p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ 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;
+ return cs_config(p_dev);
+} /* cs_probe */
/*======================================================================
@@ -263,41 +160,10 @@ static dev_link_t *cs_attach(void)
when the device is released.
======================================================================*/
-
-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 +174,14 @@ static void cs_detach(dev_link_t *link)
======================================================================*/
-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 +189,7 @@ static int first_tuple(client_handle_t h
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 +197,8 @@ static int next_tuple(client_handle_t ha
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 +206,7 @@ static void cs_config(dev_link_t *link)
int i;
u_char buf[64];
char devname[128];
- handle = link->handle;
+
dev = link->priv;
/*
@@ -350,28 +215,23 @@ static void cs_config(dev_link_t *link)
*/
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 {
-
tuple.Attributes = 0;
tuple.TupleData = buf;
tuple.TupleDataMax = 254;
@@ -379,7 +239,7 @@ static void cs_config(dev_link_t *link)
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 +250,7 @@ static void cs_config(dev_link_t *link)
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 +260,36 @@ static void cs_config(dev_link_t *link)
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 +301,13 @@ found_port:
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 +319,7 @@ found_port:
link->irq.AssignedIRQ
);
cs_release(link);
- return;
+ return -ENODEV;
}
dev->node.minor = i;
@@ -470,6 +329,7 @@ found_port:
link->io.BasePort1,
link->irq.AssignedIRQ
);
+ return 0;
} /* cs_config */
/*======================================================================
@@ -480,78 +340,27 @@ found_port:
======================================================================*/
-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)
@@ -562,13 +371,6 @@ static int __init cs_init(void)
static void __exit cs_exit(void)
{
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);
--
Karsten Keil
SuSE Labs
ISDN development
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-isdn-de+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-isdn-de+help@opensuse.org