You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (22 commits)
pcmcia: synclink_cs: fix information leak to userland
pcmcia: don't call flush_scheduled_work() spuriously
serial_cs: drop spurious flush_scheduled_work() call
pcmcia/yenta: guide users in case of problems with O2-bridges
pcmcia: fix unused function compile warning
pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device
pcmcia: add a few debug statements
pcmcia: remove obsolete and wrong comments
pcmcia: avoid messages on module (un)loading
pcmcia: move driver name to struct pcmcia_driver
pcmcia: remove the "Finally, report what we've done" message
pcmcia: use autoconfiguration feature for ioports and iomem
pcmcia: introduce autoconfiguration feature
pcmcia: Documentation update
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
pcmcia: move config_{base,index,regs} to struct pcmcia_device
pcmcia: simplify IntType
pcmcia: simplify Status, ExtStatus register access
pcmcia: remove Pin, Copy configuration register access
pcmcia: move Vpp setup to struct pcmcia_device
...
This commit is contained in:
Linus Torvalds
@@ -20,7 +20,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/ciscode.h>
|
||||
#include <pcmcia/ds.h>
|
||||
@@ -39,87 +38,32 @@ MODULE_LICENSE("GPL");
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
/*
|
||||
The event() function is this driver's Card Services event handler.
|
||||
It will be called by Card Services when an appropriate card status
|
||||
event is received. The config() and release() entry points are
|
||||
used to configure or release a socket, in response to card insertion
|
||||
and ejection events. They are invoked from the skeleton event
|
||||
handler.
|
||||
*/
|
||||
|
||||
static int avmcs_config(struct pcmcia_device *link);
|
||||
static void avmcs_release(struct pcmcia_device *link);
|
||||
|
||||
/*
|
||||
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 void avmcs_detach(struct pcmcia_device *p_dev);
|
||||
|
||||
/*======================================================================
|
||||
|
||||
avmcs_attach() creates an "instance" of the driver, allocating
|
||||
local data structures for one device. The device is registered
|
||||
with Card Services.
|
||||
|
||||
The dev_link structure is initialized, but we don't actually
|
||||
configure the card at this point -- we wait until we receive a
|
||||
card insertion event.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int avmcs_probe(struct pcmcia_device *p_dev)
|
||||
{
|
||||
|
||||
/* The io structure describes IO port mapping */
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
|
||||
/* General socket configuration */
|
||||
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;
|
||||
p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
|
||||
p_dev->config_index = 1;
|
||||
p_dev->config_regs = PRESENT_OPTION;
|
||||
|
||||
return avmcs_config(p_dev);
|
||||
} /* avmcs_attach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
This deletes a driver "instance". The device is de-registered
|
||||
with Card Services. If it has been released, all local data
|
||||
structures are freed. Otherwise, the structures will be freed
|
||||
when the device is released.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void avmcs_detach(struct pcmcia_device *link)
|
||||
{
|
||||
avmcs_release(link);
|
||||
} /* avmcs_detach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
avmcs_config() is scheduled to run after a CARD_INSERTION event
|
||||
is received, to configure the PCMCIA socket, and to make the
|
||||
ethernet device available to the system.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int avmcs_configcheck(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cf,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
unsigned int vcc,
|
||||
void *priv_data)
|
||||
static int avmcs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
|
||||
{
|
||||
if (cf->io.nwin <= 0)
|
||||
return -ENODEV;
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -150,7 +94,7 @@ static int avmcs_config(struct pcmcia_device *link)
|
||||
/*
|
||||
* configure the PCMCIA socket
|
||||
*/
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
i = pcmcia_enable_device(link);
|
||||
if (i != 0) {
|
||||
pcmcia_disable_device(link);
|
||||
break;
|
||||
@@ -197,13 +141,6 @@ static int avmcs_config(struct pcmcia_device *link)
|
||||
|
||||
} /* avmcs_config */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
After a card is removed, avmcs_release() will unregister the net
|
||||
device, and release the PCMCIA configuration. If the device is
|
||||
still open, this will be postponed until it is closed.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void avmcs_release(struct pcmcia_device *link)
|
||||
{
|
||||
@@ -222,9 +159,7 @@ MODULE_DEVICE_TABLE(pcmcia, avmcs_ids);
|
||||
|
||||
static struct pcmcia_driver avmcs_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "avm_cs",
|
||||
},
|
||||
.name = "avm_cs",
|
||||
.probe = avmcs_probe,
|
||||
.remove = avmcs_detach,
|
||||
.id_table = avmcs_ids,
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/ds.h>
|
||||
#include "hisax_cfg.h"
|
||||
@@ -40,67 +39,22 @@ module_param(isdnprot, int, 0);
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
/*
|
||||
The event() function is this driver's Card Services event handler.
|
||||
It will be called by Card Services when an appropriate card status
|
||||
event is received. The config() and release() entry points are
|
||||
used to configure or release a socket, in response to card insertion
|
||||
and ejection events. They are invoked from the skeleton event
|
||||
handler.
|
||||
*/
|
||||
|
||||
static int avma1cs_config(struct pcmcia_device *link) __devinit ;
|
||||
static void avma1cs_release(struct pcmcia_device *link);
|
||||
|
||||
/*
|
||||
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 void avma1cs_detach(struct pcmcia_device *p_dev) __devexit ;
|
||||
|
||||
|
||||
/*======================================================================
|
||||
|
||||
avma1cs_attach() creates an "instance" of the driver, allocating
|
||||
local data structures for one device. The device is registered
|
||||
with Card Services.
|
||||
|
||||
The dev_link structure is initialized, but we don't actually
|
||||
configure the card at this point -- we wait until we receive a
|
||||
card insertion event.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
|
||||
{
|
||||
dev_dbg(&p_dev->dev, "avma1cs_attach()\n");
|
||||
|
||||
/* The io structure describes IO port mapping */
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
p_dev->resource[1]->end = 16;
|
||||
p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
|
||||
|
||||
/* General socket configuration */
|
||||
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;
|
||||
p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
|
||||
p_dev->config_index = 1;
|
||||
p_dev->config_regs = PRESENT_OPTION;
|
||||
|
||||
return avma1cs_config(p_dev);
|
||||
} /* avma1cs_attach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
This deletes a driver "instance". The device is de-registered
|
||||
with Card Services. If it has been released, all local data
|
||||
structures are freed. Otherwise, the structures will be freed
|
||||
when the device is released.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void __devexit avma1cs_detach(struct pcmcia_device *link)
|
||||
{
|
||||
dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link);
|
||||
@@ -108,26 +62,13 @@ static void __devexit avma1cs_detach(struct pcmcia_device *link)
|
||||
kfree(link->priv);
|
||||
} /* avma1cs_detach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
avma1cs_config() is scheduled to run after a CARD_INSERTION event
|
||||
is received, to configure the PCMCIA socket, and to make the
|
||||
ethernet device available to the system.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int avma1cs_configcheck(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cf,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
unsigned int vcc,
|
||||
void *priv_data)
|
||||
static int avma1cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
|
||||
{
|
||||
if (cf->io.nwin <= 0)
|
||||
return -ENODEV;
|
||||
|
||||
p_dev->resource[0]->start = cf->io.win[0].base;
|
||||
p_dev->resource[0]->end = cf->io.win[0].len;
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
p_dev->io_lines = 5;
|
||||
|
||||
return pcmcia_request_io(p_dev);
|
||||
}
|
||||
|
||||
@@ -161,7 +102,7 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
|
||||
/*
|
||||
* configure the PCMCIA socket
|
||||
*/
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
i = pcmcia_enable_device(link);
|
||||
if (i != 0) {
|
||||
pcmcia_disable_device(link);
|
||||
break;
|
||||
@@ -175,9 +116,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
|
||||
(unsigned int) link->resource[0]->start, link->irq);
|
||||
|
||||
icard.para[0] = link->irq;
|
||||
icard.para[1] = link->resource[0]->start;
|
||||
icard.protocol = isdnprot;
|
||||
@@ -196,14 +134,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
|
||||
return 0;
|
||||
} /* avma1cs_config */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
After a card is removed, avma1cs_release() will unregister the net
|
||||
device, and release the PCMCIA configuration. If the device is
|
||||
still open, this will be postponed until it is closed.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void avma1cs_release(struct pcmcia_device *link)
|
||||
{
|
||||
unsigned long minor = (unsigned long) link->priv;
|
||||
@@ -216,7 +146,6 @@ static void avma1cs_release(struct pcmcia_device *link)
|
||||
pcmcia_disable_device(link);
|
||||
} /* avma1cs_release */
|
||||
|
||||
|
||||
static struct pcmcia_device_id avma1cs_ids[] = {
|
||||
PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb),
|
||||
PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b),
|
||||
@@ -226,19 +155,15 @@ MODULE_DEVICE_TABLE(pcmcia, avma1cs_ids);
|
||||
|
||||
static struct pcmcia_driver avma1cs_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "avma1_cs",
|
||||
},
|
||||
.name = "avma1_cs",
|
||||
.probe = avma1cs_probe,
|
||||
.remove = __devexit_p(avma1cs_detach),
|
||||
.id_table = avma1cs_ids,
|
||||
};
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
static int __init init_avma1_cs(void)
|
||||
{
|
||||
return(pcmcia_register_driver(&avma1cs_driver));
|
||||
return pcmcia_register_driver(&avma1cs_driver);
|
||||
}
|
||||
|
||||
static void __exit exit_avma1_cs(void)
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/cisreg.h>
|
||||
#include <pcmcia/ds.h>
|
||||
@@ -64,26 +63,8 @@ MODULE_LICENSE("Dual MPL/GPL");
|
||||
static int protocol = 2; /* EURO-ISDN Default */
|
||||
module_param(protocol, int, 0);
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
/*
|
||||
The event() function is this driver's Card Services event handler.
|
||||
It will be called by Card Services when an appropriate card status
|
||||
event is received. The config() and release() entry points are
|
||||
used to configure or release a socket, in response to card insertion
|
||||
and ejection events. They are invoked from the elsa_cs event
|
||||
handler.
|
||||
*/
|
||||
|
||||
static int elsa_cs_config(struct pcmcia_device *link) __devinit ;
|
||||
static void elsa_cs_release(struct pcmcia_device *link);
|
||||
|
||||
/*
|
||||
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 void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;
|
||||
|
||||
typedef struct local_info_t {
|
||||
@@ -92,18 +73,6 @@ typedef struct local_info_t {
|
||||
int cardnr;
|
||||
} local_info_t;
|
||||
|
||||
/*======================================================================
|
||||
|
||||
elsa_cs_attach() creates an "instance" of the driver, allocatingx
|
||||
local data structures for one device. The device is registered
|
||||
with Card Services.
|
||||
|
||||
The dev_link structure is initialized, but we don't actually
|
||||
configure the card at this point -- we wait until we receive a
|
||||
card insertion event.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int __devinit elsa_cs_probe(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local;
|
||||
@@ -119,31 +88,9 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
|
||||
|
||||
local->cardnr = -1;
|
||||
|
||||
/*
|
||||
General socket configuration defaults can go here. In this
|
||||
client, we assume very little, and rely on the CIS for almost
|
||||
everything. In most clients, many details (i.e., number, sizes,
|
||||
and attributes of IO windows) are fixed by the nature of the
|
||||
device, and can be hard-wired here.
|
||||
*/
|
||||
link->resource[0]->end = 8;
|
||||
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
|
||||
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
|
||||
return elsa_cs_config(link);
|
||||
} /* elsa_cs_attach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
This deletes a driver "instance". The device is de-registered
|
||||
with Card Services. If it has been released, all local data
|
||||
structures are freed. Otherwise, the structures will be freed
|
||||
when the device is released.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void __devexit elsa_cs_detach(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *info = link->priv;
|
||||
@@ -156,27 +103,17 @@ static void __devexit elsa_cs_detach(struct pcmcia_device *link)
|
||||
kfree(info);
|
||||
} /* elsa_cs_detach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
elsa_cs_config() is scheduled to run after a CARD_INSERTION event
|
||||
is received, to configure the PCMCIA socket, and to make the
|
||||
device available to the system.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cf,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
unsigned int vcc,
|
||||
void *priv_data)
|
||||
static int elsa_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
|
||||
{
|
||||
int j;
|
||||
|
||||
p_dev->io_lines = 3;
|
||||
p_dev->resource[0]->end = 8;
|
||||
p_dev->resource[0]->flags &= IO_DATA_PATH_WIDTH;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
|
||||
|
||||
if ((cf->io.nwin > 0) && cf->io.win[0].base) {
|
||||
if ((p_dev->resource[0]->end) && p_dev->resource[0]->start) {
|
||||
printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
|
||||
p_dev->resource[0]->start = cf->io.win[0].base;
|
||||
if (!pcmcia_request_io(p_dev))
|
||||
return 0;
|
||||
} else {
|
||||
@@ -199,6 +136,8 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
|
||||
dev_dbg(&link->dev, "elsa_config(0x%p)\n", link);
|
||||
dev = link->priv;
|
||||
|
||||
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
|
||||
|
||||
i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL);
|
||||
if (i != 0)
|
||||
goto failed;
|
||||
@@ -206,21 +145,10 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
|
||||
if (!link->irq)
|
||||
goto failed;
|
||||
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
i = pcmcia_enable_device(link);
|
||||
if (i != 0)
|
||||
goto failed;
|
||||
|
||||
/* Finally, report what we've done */
|
||||
dev_info(&link->dev, "index 0x%02x: ",
|
||||
link->conf.ConfigIndex);
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
printk(", irq %d", link->irq);
|
||||
if (link->resource[0])
|
||||
printk(" & %pR", link->resource[0]);
|
||||
if (link->resource[1])
|
||||
printk(" & %pR", link->resource[1]);
|
||||
printk("\n");
|
||||
|
||||
icard.para[0] = link->irq;
|
||||
icard.para[1] = link->resource[0]->start;
|
||||
icard.protocol = protocol;
|
||||
@@ -240,14 +168,6 @@ failed:
|
||||
return -ENODEV;
|
||||
} /* elsa_cs_config */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
After a card is removed, elsa_cs_release() will unregister the net
|
||||
device, and release the PCMCIA configuration. If the device is
|
||||
still open, this will be postponed until it is closed.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void elsa_cs_release(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local = link->priv;
|
||||
@@ -291,9 +211,7 @@ MODULE_DEVICE_TABLE(pcmcia, elsa_ids);
|
||||
|
||||
static struct pcmcia_driver elsa_cs_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "elsa_cs",
|
||||
},
|
||||
.name = "elsa_cs",
|
||||
.probe = elsa_cs_probe,
|
||||
.remove = __devexit_p(elsa_cs_detach),
|
||||
.id_table = elsa_ids,
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/cisreg.h>
|
||||
#include <pcmcia/ds.h>
|
||||
@@ -64,26 +63,9 @@ MODULE_LICENSE("Dual MPL/GPL");
|
||||
static int protocol = 2; /* EURO-ISDN Default */
|
||||
module_param(protocol, int, 0);
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
/*
|
||||
The event() function is this driver's Card Services event handler.
|
||||
It will be called by Card Services when an appropriate card status
|
||||
event is received. The config() and release() entry points are
|
||||
used to configure or release a socket, in response to card
|
||||
insertion and ejection events. They are invoked from the sedlbauer
|
||||
event handler.
|
||||
*/
|
||||
|
||||
static int sedlbauer_config(struct pcmcia_device *link) __devinit ;
|
||||
static void sedlbauer_release(struct pcmcia_device *link);
|
||||
|
||||
/*
|
||||
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 void sedlbauer_detach(struct pcmcia_device *p_dev) __devexit;
|
||||
|
||||
typedef struct local_info_t {
|
||||
@@ -92,18 +74,6 @@ typedef struct local_info_t {
|
||||
int cardnr;
|
||||
} local_info_t;
|
||||
|
||||
/*======================================================================
|
||||
|
||||
sedlbauer_attach() creates an "instance" of the driver, allocating
|
||||
local data structures for one device. The device is registered
|
||||
with Card Services.
|
||||
|
||||
The dev_link structure is initialized, but we don't actually
|
||||
configure the card at this point -- we wait until we receive a
|
||||
card insertion event.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int __devinit sedlbauer_probe(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local;
|
||||
@@ -118,35 +88,9 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
|
||||
local->p_dev = link;
|
||||
link->priv = local;
|
||||
|
||||
/*
|
||||
General socket configuration defaults can go here. In this
|
||||
client, we assume very little, and rely on the CIS for almost
|
||||
everything. In most clients, many details (i.e., number, sizes,
|
||||
and attributes of IO windows) are fixed by the nature of the
|
||||
device, and can be hard-wired here.
|
||||
*/
|
||||
|
||||
/* from old sedl_cs
|
||||
*/
|
||||
/* The io structure describes IO port mapping */
|
||||
link->resource[0]->end = 8;
|
||||
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
|
||||
link->conf.Attributes = 0;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
|
||||
return sedlbauer_config(link);
|
||||
} /* sedlbauer_attach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
This deletes a driver "instance". The device is de-registered
|
||||
with Card Services. If it has been released, all local data
|
||||
structures are freed. Otherwise, the structures will be freed
|
||||
when the device is released.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void __devexit sedlbauer_detach(struct pcmcia_device *link)
|
||||
{
|
||||
dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link);
|
||||
@@ -158,70 +102,15 @@ static void __devexit sedlbauer_detach(struct pcmcia_device *link)
|
||||
kfree(link->priv);
|
||||
} /* sedlbauer_detach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
sedlbauer_config() is scheduled to run after a CARD_INSERTION event
|
||||
is received, to configure the PCMCIA socket, and to make the
|
||||
device available to the system.
|
||||
|
||||
======================================================================*/
|
||||
static int sedlbauer_config_check(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cfg,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
unsigned int vcc,
|
||||
void *priv_data)
|
||||
static int sedlbauer_config_check(struct pcmcia_device *p_dev, void *priv_data)
|
||||
{
|
||||
if (cfg->index == 0)
|
||||
return -ENODEV;
|
||||
if (p_dev->config_index == 0)
|
||||
return -EINVAL;
|
||||
|
||||
/* Does this card need audio output? */
|
||||
if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
|
||||
p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
|
||||
p_dev->conf.Status = CCSR_AUDIO_ENA;
|
||||
}
|
||||
|
||||
/* Use power settings for Vcc and Vpp if present */
|
||||
/* Note that the CIS values need to be rescaled */
|
||||
if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
|
||||
if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
|
||||
return -ENODEV;
|
||||
} else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
|
||||
if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
|
||||
p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
|
||||
else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
|
||||
p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
|
||||
|
||||
p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
|
||||
|
||||
/* IO window settings */
|
||||
p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
|
||||
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
|
||||
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
|
||||
p_dev->resource[0]->start = io->win[0].base;
|
||||
p_dev->resource[0]->end = io->win[0].len;
|
||||
p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
|
||||
p_dev->resource[0]->flags |=
|
||||
pcmcia_io_cfg_data_width(io->flags);
|
||||
if (io->nwin > 1) {
|
||||
p_dev->resource[1]->flags = p_dev->resource[0]->flags;
|
||||
p_dev->resource[1]->start = io->win[1].base;
|
||||
p_dev->resource[1]->end = io->win[1].len;
|
||||
}
|
||||
/* This reserves IO space but doesn't actually enable it */
|
||||
p_dev->io_lines = 3;
|
||||
if (pcmcia_request_io(p_dev) != 0)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return 0;
|
||||
p_dev->io_lines = 3;
|
||||
return pcmcia_request_io(p_dev);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int __devinit sedlbauer_config(struct pcmcia_device *link)
|
||||
{
|
||||
int ret;
|
||||
@@ -229,44 +118,17 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
|
||||
|
||||
dev_dbg(&link->dev, "sedlbauer_config(0x%p)\n", link);
|
||||
|
||||
/*
|
||||
In this loop, we scan the CIS for configuration table entries,
|
||||
each of which describes a valid card configuration, including
|
||||
voltage, IO window, memory window, and interrupt settings.
|
||||
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_CHECK_VCC |
|
||||
CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;
|
||||
|
||||
We make no assumptions about the card to be configured: we use
|
||||
just the information available in the CIS. In an ideal world,
|
||||
this would work for any PCMCIA card, but it requires a complete
|
||||
and accurate CIS. In practice, a driver usually "knows" most of
|
||||
these things without consulting the CIS, and most client drivers
|
||||
will only use the CIS to fill in implementation-defined details.
|
||||
*/
|
||||
ret = pcmcia_loop_config(link, sedlbauer_config_check, NULL);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
This actually configures the PCMCIA socket -- setting up
|
||||
the I/O windows and the interrupt mapping, and putting the
|
||||
card and host interface into "Memory and IO" mode.
|
||||
*/
|
||||
ret = pcmcia_request_configuration(link, &link->conf);
|
||||
ret = pcmcia_enable_device(link);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
/* Finally, report what we've done */
|
||||
dev_info(&link->dev, "index 0x%02x:",
|
||||
link->conf.ConfigIndex);
|
||||
if (link->conf.Vpp)
|
||||
printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
printk(", irq %d", link->irq);
|
||||
if (link->resource[0])
|
||||
printk(" & %pR", link->resource[0]);
|
||||
if (link->resource[1])
|
||||
printk(" & %pR", link->resource[1]);
|
||||
printk("\n");
|
||||
|
||||
icard.para[0] = link->irq;
|
||||
icard.para[1] = link->resource[0]->start;
|
||||
icard.protocol = protocol;
|
||||
@@ -290,14 +152,6 @@ failed:
|
||||
|
||||
} /* sedlbauer_config */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
After a card is removed, sedlbauer_release() will unregister the
|
||||
device, and release the PCMCIA configuration. If the device is
|
||||
still open, this will be postponed until it is closed.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void sedlbauer_release(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local = link->priv;
|
||||
@@ -346,9 +200,7 @@ MODULE_DEVICE_TABLE(pcmcia, sedlbauer_ids);
|
||||
|
||||
static struct pcmcia_driver sedlbauer_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "sedlbauer_cs",
|
||||
},
|
||||
.name = "sedlbauer_cs",
|
||||
.probe = sedlbauer_probe,
|
||||
.remove = __devexit_p(sedlbauer_detach),
|
||||
.id_table = sedlbauer_ids,
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include <pcmcia/cs.h>
|
||||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/cisreg.h>
|
||||
#include <pcmcia/ds.h>
|
||||
@@ -45,26 +44,8 @@ MODULE_LICENSE("GPL");
|
||||
static int protocol = 2; /* EURO-ISDN Default */
|
||||
module_param(protocol, int, 0);
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
/*
|
||||
The event() function is this driver's Card Services event handler.
|
||||
It will be called by Card Services when an appropriate card status
|
||||
event is received. The config() and release() entry points are
|
||||
used to configure or release a socket, in response to card insertion
|
||||
and ejection events. They are invoked from the teles_cs event
|
||||
handler.
|
||||
*/
|
||||
|
||||
static int teles_cs_config(struct pcmcia_device *link) __devinit ;
|
||||
static void teles_cs_release(struct pcmcia_device *link);
|
||||
|
||||
/*
|
||||
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 void teles_detach(struct pcmcia_device *p_dev) __devexit ;
|
||||
|
||||
typedef struct local_info_t {
|
||||
@@ -73,18 +54,6 @@ typedef struct local_info_t {
|
||||
int cardnr;
|
||||
} local_info_t;
|
||||
|
||||
/*======================================================================
|
||||
|
||||
teles_attach() creates an "instance" of the driver, allocatingx
|
||||
local data structures for one device. The device is registered
|
||||
with Card Services.
|
||||
|
||||
The dev_link structure is initialized, but we don't actually
|
||||
configure the card at this point -- we wait until we receive a
|
||||
card insertion event.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int __devinit teles_probe(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local;
|
||||
@@ -99,31 +68,11 @@ static int __devinit teles_probe(struct pcmcia_device *link)
|
||||
local->p_dev = link;
|
||||
link->priv = local;
|
||||
|
||||
/*
|
||||
General socket configuration defaults can go here. In this
|
||||
client, we assume very little, and rely on the CIS for almost
|
||||
everything. In most clients, many details (i.e., number, sizes,
|
||||
and attributes of IO windows) are fixed by the nature of the
|
||||
device, and can be hard-wired here.
|
||||
*/
|
||||
link->resource[0]->end = 96;
|
||||
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
|
||||
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
|
||||
|
||||
return teles_cs_config(link);
|
||||
} /* teles_attach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
This deletes a driver "instance". The device is de-registered
|
||||
with Card Services. If it has been released, all local data
|
||||
structures are freed. Otherwise, the structures will be freed
|
||||
when the device is released.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void __devexit teles_detach(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *info = link->priv;
|
||||
@@ -136,27 +85,17 @@ static void __devexit teles_detach(struct pcmcia_device *link)
|
||||
kfree(info);
|
||||
} /* teles_detach */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
teles_cs_config() is scheduled to run after a CARD_INSERTION event
|
||||
is received, to configure the PCMCIA socket, and to make the
|
||||
device available to the system.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int teles_cs_configcheck(struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cf,
|
||||
cistpl_cftable_entry_t *dflt,
|
||||
unsigned int vcc,
|
||||
void *priv_data)
|
||||
static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
|
||||
{
|
||||
int j;
|
||||
|
||||
p_dev->io_lines = 5;
|
||||
p_dev->resource[0]->end = 96;
|
||||
p_dev->resource[0]->flags &= IO_DATA_PATH_WIDTH;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
|
||||
|
||||
if ((cf->io.nwin > 0) && cf->io.win[0].base) {
|
||||
if ((p_dev->resource[0]->end) && p_dev->resource[0]->start) {
|
||||
printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
|
||||
p_dev->resource[0]->start = cf->io.win[0].base;
|
||||
if (!pcmcia_request_io(p_dev))
|
||||
return 0;
|
||||
} else {
|
||||
@@ -186,21 +125,10 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
|
||||
if (!link->irq)
|
||||
goto cs_failed;
|
||||
|
||||
i = pcmcia_request_configuration(link, &link->conf);
|
||||
i = pcmcia_enable_device(link);
|
||||
if (i != 0)
|
||||
goto cs_failed;
|
||||
|
||||
/* Finally, report what we've done */
|
||||
dev_info(&link->dev, "index 0x%02x:",
|
||||
link->conf.ConfigIndex);
|
||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||
printk(", irq %d", link->irq);
|
||||
if (link->resource[0])
|
||||
printk(" & %pR", link->resource[0]);
|
||||
if (link->resource[1])
|
||||
printk(" & %pR", link->resource[1]);
|
||||
printk("\n");
|
||||
|
||||
icard.para[0] = link->irq;
|
||||
icard.para[1] = link->resource[0]->start;
|
||||
icard.protocol = protocol;
|
||||
@@ -222,14 +150,6 @@ cs_failed:
|
||||
return -ENODEV;
|
||||
} /* teles_cs_config */
|
||||
|
||||
/*======================================================================
|
||||
|
||||
After a card is removed, teles_cs_release() will unregister the net
|
||||
device, and release the PCMCIA configuration. If the device is
|
||||
still open, this will be postponed until it is closed.
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void teles_cs_release(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local = link->priv;
|
||||
@@ -273,9 +193,7 @@ MODULE_DEVICE_TABLE(pcmcia, teles_ids);
|
||||
|
||||
static struct pcmcia_driver teles_cs_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "teles_cs",
|
||||
},
|
||||
.name = "teles_cs",
|
||||
.probe = teles_probe,
|
||||
.remove = __devexit_p(teles_detach),
|
||||
.id_table = teles_ids,
|
||||
|
||||
Reference in New Issue
Block a user