hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcmcia: do not use io_req_t when calling pcmcia_request_io() 

Instead of io_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
ranges. After a call to pcmcia_request_io(), the ports found there
are reserved, after calling pcmcia_request_configuration(), they may
be used.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2010-07-24 17:23:51 +02:00
parent 9a017a9103
commit 90abdc3b97
57 changed files with 525 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/pcmcia/driver-changes.txt
View File

@ -1,4 +1,11 @@
This file details changes in 2.6 which affect PCMCIA card driver authors: This file details changes in 2.6 which affect PCMCIA card driver authors:
* pcmcia_request_io changes (as of 2.6.36)
Instead of io_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
ranges. After a call to pcmcia_request_io(), the ports found there
are reserved, after calling pcmcia_request_configuration(), they may
be used.
* No dev_info_t, no cs_types.h (as of 2.6.36) * No dev_info_t, no cs_types.h (as of 2.6.36)
dev_info_t and a few other typedefs are removed. No longer use them dev_info_t and a few other typedefs are removed. No longer use them
in PCMCIA device drivers. Also, do not include pcmcia/cs_types.h, as in PCMCIA device drivers. Also, do not include pcmcia/cs_types.h, as

29
drivers/ata/pata_pcmcia.c
View File

@ -200,21 +200,23 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
pdev->io.BasePort1 = io->win[0].base; pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; pdev->resource[0]->start = io->win[0].base;
if (!(io->flags & CISTPL_IO_16BIT)) if (!(io->flags & CISTPL_IO_16BIT)) {
pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
}
if (io->nwin == 2) { if (io->nwin == 2) {
pdev->io.NumPorts1 = 8; pdev->resource[0]->end = 8;
pdev->io.BasePort2 = io->win[1].base; pdev->resource[1]->start = io->win[1].base;
pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1; pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;
if (pcmcia_request_io(pdev, &pdev->io) != 0) if (pcmcia_request_io(pdev) != 0)
return -ENODEV; return -ENODEV;
stk->ctl_base = pdev->resource[1]->start; stk->ctl_base = pdev->resource[1]->start;
} else if ((io->nwin == 1) && (io->win[0].len >= 16)) { } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
pdev->io.NumPorts1 = io->win[0].len; pdev->resource[0]->end = io->win[0].len;
pdev->io.NumPorts2 = 0; pdev->resource[1]->end = 0;
if (pcmcia_request_io(pdev, &pdev->io) != 0) if (pcmcia_request_io(pdev) != 0)
return -ENODEV; return -ENODEV;
stk->ctl_base = pdev->resource[0]->start + 0x0e; stk->ctl_base = pdev->resource[0]->start + 0x0e;
} else } else
@ -245,9 +247,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
struct ata_port_operations *ops = &pcmcia_port_ops; struct ata_port_operations *ops = &pcmcia_port_ops;
/* Set up attributes in order to probe card and get resources */ /* Set up attributes in order to probe card and get resources */
pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
pdev->io.IOAddrLines = 3;
pdev->conf.Attributes = CONF_ENABLE_IRQ; pdev->conf.Attributes = CONF_ENABLE_IRQ;
pdev->conf.IntType = INT_MEMORY_AND_IO; pdev->conf.IntType = INT_MEMORY_AND_IO;

13
drivers/bluetooth/bluecard_cs.c
View File

@ -865,9 +865,6 @@ static int bluecard_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -890,12 +887,14 @@ static int bluecard_config(struct pcmcia_device *link)
int i, n; int i, n;
link->conf.ConfigIndex = 0x20; link->conf.ConfigIndex = 0x20;
link->io.NumPorts1 = 64;
link->io.IOAddrLines = 6; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->resource[0]->end = 64;
link->io_lines = 6;
for (n = 0; n < 0x400; n += 0x40) { for (n = 0; n < 0x400; n += 0x40) {
link->io.BasePort1 = n ^ 0x300; link->resource[0]->start = n ^ 0x300;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }

18
drivers/bluetooth/bt3c_cs.c
View File

@ -657,8 +657,8 @@ static int bt3c_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -683,14 +683,14 @@ static int bt3c_check_config(struct pcmcia_device *p_dev,
{ {
unsigned long try = (unsigned long) priv_data; unsigned long try = (unsigned long) priv_data;
p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
(cf->io.win[0].base != 0)) { (cf->io.win[0].base != 0)) {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.IOAddrLines = (try == 0) ? 16 : if (!pcmcia_request_io(p_dev))
cf->io.flags & CISTPL_IO_LINES_MASK;
if (!pcmcia_request_io(p_dev, &p_dev->io))
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -707,9 +707,9 @@ static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,
if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
for (j = 0; j < 5; j++) { for (j = 0; j < 5; j++) {
p_dev->io.BasePort1 = base[j]; p_dev->resource[0]->start = base[j];
p_dev->io.IOAddrLines = base[j] ? 16 : 3; p_dev->io_lines = base[j] ? 16 : 3;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }

18
drivers/bluetooth/btuart_cs.c
View File

@ -586,8 +586,8 @@ static int btuart_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -612,14 +612,14 @@ static int btuart_check_config(struct pcmcia_device *p_dev,
{ {
int *try = priv_data; int *try = priv_data;
p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
(cf->io.win[0].base != 0)) { (cf->io.win[0].base != 0)) {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.IOAddrLines = (*try == 0) ? 16 : if (!pcmcia_request_io(p_dev))
cf->io.flags & CISTPL_IO_LINES_MASK;
if (!pcmcia_request_io(p_dev, &p_dev->io))
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -636,9 +636,9 @@ static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
for (j = 0; j < 5; j++) { for (j = 0; j < 5; j++) {
p_dev->io.BasePort1 = base[j]; p_dev->resource[0]->start = base[j];
p_dev->io.IOAddrLines = base[j] ? 16 : 3; p_dev->io_lines = base[j] ? 16 : 3;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }

21
drivers/bluetooth/dtl1_cs.c
View File

@ -572,8 +572,8 @@ static int dtl1_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -597,14 +597,13 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) { if ((cf->io.nwin != 1) || (cf->io.win[0].len <= 8))
p_dev->io.BasePort1 = cf->io.win[0].base; return -ENODEV;
p_dev->io.NumPorts1 = cf->io.win[0].len; /*yo */
p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->start = cf->io.win[0].base;
if (!pcmcia_request_io(p_dev, &p_dev->io)) p_dev->resource[0]->end = cf->io.win[0].len; /*yo */
return 0; p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
} return pcmcia_request_io(p_dev);
return -ENODEV;
} }
static int dtl1_config(struct pcmcia_device *link) static int dtl1_config(struct pcmcia_device *link)
@ -613,7 +612,7 @@ static int dtl1_config(struct pcmcia_device *link)
int i; int i;
/* Look for a generic full-sized window */ /* Look for a generic full-sized window */
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0) if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)
goto failed; goto failed;

15
drivers/char/pcmcia/cm4000_cs.c
View File

@ -1751,17 +1751,12 @@ static int cm4000_config_check(struct pcmcia_device *p_dev,
if (!cfg->io.nwin) if (!cfg->io.nwin)
return -ENODEV; return -ENODEV;
/* Get the IOaddr */ p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->resource[0]->end = cfg->io.win[0].len;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
if (!(cfg->io.flags & CISTPL_IO_8BIT))
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
if (!(cfg->io.flags & CISTPL_IO_16BIT))
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int cm4000_config(struct pcmcia_device * link, int devno) static int cm4000_config(struct pcmcia_device * link, int devno)

18
drivers/char/pcmcia/cm4040_cs.c
View File

@ -527,16 +527,12 @@ static int cm4040_config_check(struct pcmcia_device *p_dev,
return -ENODEV; return -ENODEV;
/* Get the IOaddr */ /* Get the IOaddr */
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->end = cfg->io.win[0].len;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
if (!(cfg->io.flags & CISTPL_IO_8BIT)) p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; rc = pcmcia_request_io(p_dev);
if (!(cfg->io.flags & CISTPL_IO_16BIT))
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
rc = pcmcia_request_io(p_dev, &p_dev->io);
dev_printk(KERN_INFO, &p_dev->dev, dev_printk(KERN_INFO, &p_dev->dev,
"pcmcia_request_io returned 0x%x\n", rc); "pcmcia_request_io returned 0x%x\n", rc);
return rc; return rc;
@ -548,10 +544,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
struct reader_dev *dev; struct reader_dev *dev;
int fail_rc; int fail_rc;
link->io.BasePort2 = 0;
link->io.NumPorts2 = 0;
link->io.Attributes2 = 0;
if (pcmcia_loop_config(link, cm4040_config_check, NULL)) if (pcmcia_loop_config(link, cm4040_config_check, NULL))
goto cs_release; goto cs_release;

10
drivers/char/pcmcia/ipwireless/main.c
View File

@ -88,15 +88,15 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
memreq_t memreq_common_memory; memreq_t memreq_common_memory;
int ret; int ret;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->end = cfg->io.win[0].len;
p_dev->io.IOAddrLines = 16;
/* 0x40 causes it to generate level mode interrupts. */ /* 0x40 causes it to generate level mode interrupts. */
/* 0x04 enables IREQ pin. */ /* 0x04 enables IREQ pin. */
p_dev->conf.ConfigIndex = cfg->index | 0x44; p_dev->conf.ConfigIndex = cfg->index | 0x44;
ret = pcmcia_request_io(p_dev, &p_dev->io); p_dev->io_lines = 16;
ret = pcmcia_request_io(p_dev);
if (ret) if (ret)
return ret; return ret;

21
drivers/char/pcmcia/synclink_cs.c
View File

@ -571,18 +571,15 @@ static int mgslpc_ioprobe(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
if (cfg->io.nwin > 0) { if (!cfg->io.nwin)
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; return -ENODEV;
if (!(cfg->io.flags & CISTPL_IO_8BIT))
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->start = cfg->io.win[0].base;
if (!(cfg->io.flags & CISTPL_IO_16BIT)) p_dev->resource[0]->end = cfg->io.win[0].len;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
p_dev->io.BasePort1 = cfg->io.win[0].base;
p_dev->io.NumPorts1 = cfg->io.win[0].len; return pcmcia_request_io(p_dev);
return pcmcia_request_io(p_dev, &p_dev->io);
}
return -ENODEV;
} }
static int mgslpc_config(struct pcmcia_device *link) static int mgslpc_config(struct pcmcia_device *link)

30
drivers/ide/ide-cs.c
View File

@ -97,9 +97,8 @@ static int ide_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.IOAddrLines = 3;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -228,22 +227,25 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
pdev->conf.ConfigIndex = cfg->index; pdev->conf.ConfigIndex = cfg->index;
pdev->io.BasePort1 = io->win[0].base; pdev->resource[0]->start = io->win[0].base;
pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; if (!(io->flags & CISTPL_IO_16BIT)) {
if (!(io->flags & CISTPL_IO_16BIT)) pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
}
if (io->nwin == 2) { if (io->nwin == 2) {
pdev->io.NumPorts1 = 8; pdev->resource[0]->end = 8;
pdev->io.BasePort2 = io->win[1].base; pdev->resource[1]->start = io->win[1].base;
pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1; pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;
if (pcmcia_request_io(pdev, &pdev->io) != 0) if (pcmcia_request_io(pdev) != 0)
return -ENODEV; return -ENODEV;
stk->ctl_base = pdev->resource[1]->start; stk->ctl_base = pdev->resource[1]->start;
} else if ((io->nwin == 1) && (io->win[0].len >= 16)) { } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
pdev->io.NumPorts1 = io->win[0].len; pdev->resource[0]->end = io->win[0].len;
pdev->io.NumPorts2 = 0; pdev->resource[1]->end = 0;
if (pcmcia_request_io(pdev, &pdev->io) != 0) if (pcmcia_request_io(pdev) != 0)
return -ENODEV; return -ENODEV;
stk->ctl_base = pdev->resource[0]->start + 0x0e; stk->ctl_base = pdev->resource[0]->start + 0x0e;
} else } else

15
drivers/isdn/hardware/avm/avm_cs.c
View File

@ -75,9 +75,8 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
{ {
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
p_dev->io.NumPorts1 = 16; p_dev->resource[0]->end = 16;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.NumPorts2 = 0;
/* General socket configuration */ /* General socket configuration */
p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.Attributes = CONF_ENABLE_IRQ;
@ -119,13 +118,9 @@ static int avmcs_configcheck(struct pcmcia_device *p_dev,
if (cf->io.nwin <= 0) if (cf->io.nwin <= 0)
return -ENODEV; return -ENODEV;
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.NumPorts1 = cf->io.win[0].len; p_dev->resource[0]->end = cf->io.win[0].len;
p_dev->io.NumPorts2 = 0; return pcmcia_request_io(p_dev);
printk(KERN_INFO "avm_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);
} }
static int avmcs_config(struct pcmcia_device *link) static int avmcs_config(struct pcmcia_device *link)

20
drivers/isdn/hisax/avma1_cs.c
View File

@ -78,11 +78,10 @@ static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
dev_dbg(&p_dev->dev, "avma1cs_attach()\n"); dev_dbg(&p_dev->dev, "avma1cs_attach()\n");
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
p_dev->io.NumPorts1 = 16; p_dev->resource[0]->end = 16;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.NumPorts2 = 16; p_dev->resource[1]->end = 16;
p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_16; p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
p_dev->io.IOAddrLines = 5;
/* General socket configuration */ /* General socket configuration */
p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.Attributes = CONF_ENABLE_IRQ;
@ -126,13 +125,10 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev,
if (cf->io.nwin <= 0) if (cf->io.nwin <= 0)
return -ENODEV; return -ENODEV;
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.NumPorts1 = cf->io.win[0].len; p_dev->resource[0]->end = cf->io.win[0].len;
p_dev->io.NumPorts2 = 0; p_dev->io_lines = 5;
printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n", return pcmcia_request_io(p_dev);
p_dev->io.BasePort1,
p_dev->io.BasePort1+p_dev->io.NumPorts1-1);
return pcmcia_request_io(p_dev, &p_dev->io);
} }

15
drivers/isdn/hisax/elsa_cs.c
View File

@ -126,9 +126,8 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
and attributes of IO windows) are fixed by the nature of the and attributes of IO windows) are fixed by the nature of the
device, and can be hard-wired here. device, and can be hard-wired here.
*/ */
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 3;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -173,16 +172,18 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
{ {
int j; int j;
p_dev->io_lines = 3;
if ((cf->io.nwin > 0) && cf->io.win[0].base) { if ((cf->io.nwin > 0) && cf->io.win[0].base) {
printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n"); printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} else { } else {
printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n"); printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
for (j = 0x2f0; j > 0x100; j -= 0x10) { for (j = 0x2f0; j > 0x100; j -= 0x10) {
p_dev->io.BasePort1 = j; p_dev->resource[0]->start = j;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }

28
drivers/isdn/hisax/sedlbauer_cs.c
View File

@ -129,9 +129,8 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
/* from old sedl_cs /* from old sedl_cs
*/ */
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.IOAddrLines = 3;
link->conf.Attributes = 0; link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -201,23 +200,22 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->start = io->win[0].base;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->end = io->win[0].len;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
if (!(io->flags & CISTPL_IO_16BIT)) p_dev->resource[0]->flags |=
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; pcmcia_io_cfg_data_width(io->flags);
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) p_dev->io_lines = 3;
if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
} }

15
drivers/isdn/hisax/teles_cs.c
View File

@ -106,9 +106,8 @@ static int __devinit teles_probe(struct pcmcia_device *link)
and attributes of IO windows) are fixed by the nature of the and attributes of IO windows) are fixed by the nature of the
device, and can be hard-wired here. device, and can be hard-wired here.
*/ */
link->io.NumPorts1 = 96; link->resource[0]->end = 96;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 5;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -153,16 +152,18 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev,
{ {
int j; int j;
p_dev->io_lines = 5;
if ((cf->io.nwin > 0) && cf->io.win[0].base) { if ((cf->io.nwin > 0) && cf->io.win[0].base) {
printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} else { } else {
printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");
for (j = 0x2f0; j > 0x100; j -= 0x10) { for (j = 0x2f0; j > 0x100; j -= 0x10) {
p_dev->io.BasePort1 = j; p_dev->resource[0]->start = j;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }

11
drivers/net/pcmcia/3c574_cs.c
View File

@ -278,8 +278,8 @@ static int tc574_probe(struct pcmcia_device *link)
lp->p_dev = link; lp->p_dev = link;
spin_lock_init(&lp->window_lock); spin_lock_init(&lp->window_lock);
link->io.NumPorts1 = 32; link->resource[0]->end = 32;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1; link->conf.ConfigIndex = 1;
@ -337,10 +337,11 @@ static int tc574_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "3c574_config()\n"); dev_dbg(&link->dev, "3c574_config()\n");
link->io.IOAddrLines = 16; link->io_lines = 16;
for (i = j = 0; j < 0x400; j += 0x20) { for (i = j = 0; j < 0x400; j += 0x20) {
link->io.BasePort1 = j ^ 0x300; link->resource[0]->start = j ^ 0x300;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }

11
drivers/net/pcmcia/3c589_cs.c
View File

@ -213,8 +213,8 @@ static int tc589_probe(struct pcmcia_device *link)
lp->p_dev = link; lp->p_dev = link;
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -277,12 +277,13 @@ static int tc589_config(struct pcmcia_device *link)
"3Com card??\n"); "3Com card??\n");
multi = (link->card_id == PRODID_3COM_3C562); multi = (link->card_id == PRODID_3COM_3C562);
link->io_lines = 16;
/* For the 3c562, the base address must be xx00-xx7f */ /* For the 3c562, the base address must be xx00-xx7f */
link->io.IOAddrLines = 16;
for (i = j = 0; j < 0x400; j += 0x10) { for (i = j = 0; j < 0x400; j += 0x10) {
if (multi && (j & 0x80)) continue; if (multi && (j & 0x80)) continue;
link->io.BasePort1 = j ^ 0x300; link->resource[0]->start = j ^ 0x300;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }

40
drivers/net/pcmcia/axnet_cs.c
View File

@ -259,28 +259,30 @@ static int get_prom(struct pcmcia_device *link)
static int try_io_port(struct pcmcia_device *link) static int try_io_port(struct pcmcia_device *link)
{ {
int j, ret; int j, ret;
if (link->io.NumPorts1 == 32) { link->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
if (link->resource[0]->end == 32) {
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
/* for master/slave multifunction cards */ /* for master/slave multifunction cards */
if (link->io.NumPorts2 > 0) if (link->resource[1]->end > 0)
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
} else { } else {
/* This should be two 16-port windows */ /* This should be two 16-port windows */
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_16; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
} }
if (link->io.BasePort1 == 0) { if (link->resource[0]->start == 0) {
link->io.IOAddrLines = 16;
for (j = 0; j < 0x400; j += 0x20) { for (j = 0; j < 0x400; j += 0x20) {
link->io.BasePort1 = j ^ 0x300; link->resource[0]->start = j ^ 0x300;
link->io.BasePort2 = (j ^ 0x300) + 0x10; link->resource[1]->start = (j ^ 0x300) + 0x10;
ret = pcmcia_request_io(link, &link->io); link->io_lines = 16;
ret = pcmcia_request_io(link);
if (ret == 0) if (ret == 0)
return ret; return ret;
} }
return ret; return ret;
} else { } else {
return pcmcia_request_io(link, &link->io); return pcmcia_request_io(link);
} }
} }
@ -301,15 +303,15 @@ static int axnet_configcheck(struct pcmcia_device *p_dev,
network function with window 0, and serial with window 1 */ network function with window 0, and serial with window 1 */
if (io->nwin > 1) { if (io->nwin > 1) {
i = (io->win[1].len > io->win[0].len); i = (io->win[1].len > io->win[0].len);
p_dev->io.BasePort2 = io->win[1-i].base; p_dev->resource[1]->start = io->win[1-i].base;
p_dev->io.NumPorts2 = io->win[1-i].len; p_dev->resource[1]->end = io->win[1-i].len;
} else { } else {
i = p_dev->io.NumPorts2 = 0; i = p_dev->resource[1]->end = 0;
} }
p_dev->io.BasePort1 = io->win[i].base; p_dev->resource[0]->start = io->win[i].base;
p_dev->io.NumPorts1 = io->win[i].len; p_dev->resource[0]->end = io->win[i].len;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32) if (p_dev->resource[0]->end + p_dev->resource[1]->end >= 32)
return try_io_port(p_dev); return try_io_port(p_dev);
return -ENODEV; return -ENODEV;

19
drivers/net/pcmcia/com20020_cs.c
View File

@ -158,9 +158,8 @@ static int com20020_probe(struct pcmcia_device *p_dev)
/* fill in our module parameters as defaults */ /* fill in our module parameters as defaults */
dev->dev_addr[0] = node; dev->dev_addr[0] = node;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.NumPorts1 = 16; p_dev->resource[0]->end = 16;
p_dev->io.IOAddrLines = 16;
p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.Attributes = CONF_ENABLE_IRQ;
p_dev->conf.IntType = INT_MEMORY_AND_IO; p_dev->conf.IntType = INT_MEMORY_AND_IO;
@ -245,20 +244,24 @@ static int com20020_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "com20020_config\n"); dev_dbg(&link->dev, "com20020_config\n");
dev_dbg(&link->dev, "baseport1 is %Xh\n", link->io.BasePort1); dev_dbg(&link->dev, "baseport1 is %Xh\n",
(unsigned int) link->resource[0]->start);
i = -ENODEV; i = -ENODEV;
if (!link->io.BasePort1) link->io_lines = 16;
if (!link->resource[0]->start)
{ {
for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10) for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
{ {
link->io.BasePort1 = ioaddr; link->resource[0]->start = ioaddr;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }
} }
else else
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i != 0) if (i != 0)
{ {

31
drivers/net/pcmcia/fmvj18x_cs.c
View File

@ -248,9 +248,8 @@ static int fmvj18x_probe(struct pcmcia_device *link)
lp->base = NULL; lp->base = NULL;
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
link->io.NumPorts1 = 32; link->resource[0]->end = 32;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 5;
/* General socket configuration */ /* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
@ -288,13 +287,13 @@ static int mfc_try_io_port(struct pcmcia_device *link)
{ 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
link->io.BasePort2 = serial_base[i]; link->resource[1]->start = serial_base[i];
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
if (link->io.BasePort2 == 0) { if (link->resource[1]->start == 0) {
link->io.NumPorts2 = 0; link->resource[1]->end = 0;
printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n"); printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
} }
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret == 0) if (ret == 0)
return ret; return ret;
} }
@ -310,8 +309,8 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
0x380,0x3c0 only for ioport. 0x380,0x3c0 only for ioport.
*/ */
for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) { for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
link->io.BasePort1 = ioaddr; link->resource[0]->start = ioaddr;
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret == 0) { if (ret == 0) {
/* calculate ConfigIndex value */ /* calculate ConfigIndex value */
link->conf.ConfigIndex = link->conf.ConfigIndex =
@ -345,6 +344,8 @@ static int fmvj18x_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "fmvj18x_config\n"); dev_dbg(&link->dev, "fmvj18x_config\n");
link->io_lines = 5;
len = pcmcia_get_tuple(link, CISTPL_FUNCE, &buf); len = pcmcia_get_tuple(link, CISTPL_FUNCE, &buf);
kfree(buf); kfree(buf);
@ -363,20 +364,20 @@ static int fmvj18x_config(struct pcmcia_device *link)
/* MultiFunction Card */ /* MultiFunction Card */
link->conf.ConfigBase = 0x800; link->conf.ConfigBase = 0x800;
link->conf.ConfigIndex = 0x47; link->conf.ConfigIndex = 0x47;
link->io.NumPorts2 = 8; link->resource[1]->end = 8;
} }
break; break;
case MANFID_NEC: case MANFID_NEC:
cardtype = NEC; /* MultiFunction Card */ cardtype = NEC; /* MultiFunction Card */
link->conf.ConfigBase = 0x800; link->conf.ConfigBase = 0x800;
link->conf.ConfigIndex = 0x47; link->conf.ConfigIndex = 0x47;
link->io.NumPorts2 = 8; link->resource[1]->end = 8;
break; break;
case MANFID_KME: case MANFID_KME:
cardtype = KME; /* MultiFunction Card */ cardtype = KME; /* MultiFunction Card */
link->conf.ConfigBase = 0x800; link->conf.ConfigBase = 0x800;
link->conf.ConfigIndex = 0x47; link->conf.ConfigIndex = 0x47;
link->io.NumPorts2 = 8; link->resource[1]->end = 8;
break; break;
case MANFID_CONTEC: case MANFID_CONTEC:
cardtype = CONTEC; cardtype = CONTEC;
@ -417,14 +418,14 @@ static int fmvj18x_config(struct pcmcia_device *link)
} }
} }
if (link->io.NumPorts2 != 0) { if (link->resource[1]->end != 0) {
ret = mfc_try_io_port(link); ret = mfc_try_io_port(link);
if (ret != 0) goto failed; if (ret != 0) goto failed;
} else if (cardtype == UNGERMANN) { } else if (cardtype == UNGERMANN) {
ret = ungermann_try_io_port(link); ret = ungermann_try_io_port(link);
if (ret != 0) goto failed; if (ret != 0) goto failed;
} else { } else {
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret) if (ret)
goto failed; goto failed;
} }

14
drivers/net/pcmcia/ibmtr_cs.c
View File

@ -151,9 +151,8 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link)
link->priv = info; link->priv = info;
info->ti = netdev_priv(dev); info->ti = netdev_priv(dev);
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 4; link->resource[0]->end = 4;
link->io.IOAddrLines = 16;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION; link->conf.Present = PRESENT_OPTION;
@ -218,16 +217,17 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "ibmtr_config\n"); dev_dbg(&link->dev, "ibmtr_config\n");
link->conf.ConfigIndex = 0x61; link->conf.ConfigIndex = 0x61;
link->io_lines = 16;
/* Determine if this is PRIMARY or ALTERNATE. */ /* Determine if this is PRIMARY or ALTERNATE. */
/* Try PRIMARY card at 0xA20-0xA23 */ /* Try PRIMARY card at 0xA20-0xA23 */
link->io.BasePort1 = 0xA20; link->resource[0]->start = 0xA20;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i != 0) { if (i != 0) {
/* Couldn't get 0xA20-0xA23. Try ALTERNATE at 0xA24-0xA27. */ /* Couldn't get 0xA20-0xA23. Try ALTERNATE at 0xA24-0xA27. */
link->io.BasePort1 = 0xA24; link->resource[0]->start = 0xA24;
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret) if (ret)
goto failed; goto failed;
} }

8
drivers/net/pcmcia/nmclan_cs.c
View File

@ -458,9 +458,8 @@ static int nmclan_probe(struct pcmcia_device *link)
link->priv = dev; link->priv = dev;
spin_lock_init(&lp->bank_lock); spin_lock_init(&lp->bank_lock);
link->io.NumPorts1 = 32; link->resource[0]->end = 32;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 5;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1; link->conf.ConfigIndex = 1;
@ -644,7 +643,8 @@ static int nmclan_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "nmclan_config\n"); dev_dbg(&link->dev, "nmclan_config\n");
ret = pcmcia_request_io(link, &link->io); link->io_lines = 5;
ret = pcmcia_request_io(link);
if (ret) if (ret)
goto failed; goto failed;
ret = pcmcia_request_exclusive_irq(link, mace_interrupt); ret = pcmcia_request_exclusive_irq(link, mace_interrupt);

40
drivers/net/pcmcia/pcnet_cs.c
View File

@ -477,29 +477,31 @@ static hw_info_t *get_hwired(struct pcmcia_device *link)
static int try_io_port(struct pcmcia_device *link) static int try_io_port(struct pcmcia_device *link)
{ {
int j, ret; int j, ret;
if (link->io.NumPorts1 == 32) { link->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
if (link->io.NumPorts2 > 0) { if (link->resource[0]->end == 32) {
link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
if (link->resource[1]->end > 0) {
/* for master/slave multifunction cards */ /* for master/slave multifunction cards */
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
} }
} else { } else {
/* This should be two 16-port windows */ /* This should be two 16-port windows */
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_16; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
} }
if (link->io.BasePort1 == 0) { if (link->resource[0]->start == 0) {
link->io.IOAddrLines = 16;
for (j = 0; j < 0x400; j += 0x20) { for (j = 0; j < 0x400; j += 0x20) {
link->io.BasePort1 = j ^ 0x300; link->resource[0]->start = j ^ 0x300;
link->io.BasePort2 = (j ^ 0x300) + 0x10; link->resource[1]->start = (j ^ 0x300) + 0x10;
ret = pcmcia_request_io(link, &link->io); link->io_lines = 16;
ret = pcmcia_request_io(link);
if (ret == 0) if (ret == 0)
return ret; return ret;
} }
return ret; return ret;
} else { } else {
return pcmcia_request_io(link, &link->io); return pcmcia_request_io(link);
} }
} }
@ -520,18 +522,18 @@ static int pcnet_confcheck(struct pcmcia_device *p_dev,
network function with window 0, and serial with window 1 */ network function with window 0, and serial with window 1 */
if (io->nwin > 1) { if (io->nwin > 1) {
i = (io->win[1].len > io->win[0].len); i = (io->win[1].len > io->win[0].len);
p_dev->io.BasePort2 = io->win[1-i].base; p_dev->resource[1]->start = io->win[1-i].base;
p_dev->io.NumPorts2 = io->win[1-i].len; p_dev->resource[1]->end = io->win[1-i].len;
} else { } else {
i = p_dev->io.NumPorts2 = 0; i = p_dev->resource[1]->end = 0;
} }
*has_shmem = ((cfg->mem.nwin == 1) && *has_shmem = ((cfg->mem.nwin == 1) &&
(cfg->mem.win[0].len >= 0x4000)); (cfg->mem.win[0].len >= 0x4000));
p_dev->io.BasePort1 = io->win[i].base; p_dev->resource[0]->start = io->win[i].base;
p_dev->io.NumPorts1 = io->win[i].len; p_dev->resource[0]->end = io->win[i].len;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32) if (p_dev->resource[0]->end + p_dev->resource[1]->end >= 32)
return try_io_port(p_dev); return try_io_port(p_dev);
return 0; return 0;

43
drivers/net/pcmcia/smc91c92_cs.c
View File

@ -324,9 +324,8 @@ static int smc91c92_probe(struct pcmcia_device *link)
link->priv = dev; link->priv = dev;
spin_lock_init(&smc->lock); spin_lock_init(&smc->lock);
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 4;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -427,12 +426,13 @@ static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
void *priv_data) void *priv_data)
{ {
int k; int k;
p_dev->io.BasePort2 = cf->io.win[0].base; p_dev->resource[1]->start = cf->io.win[0].base;
for (k = 0; k < 0x400; k += 0x10) { for (k = 0; k < 0x400; k += 0x10) {
if (k & 0x80) if (k & 0x80)
continue; continue;
p_dev->io.BasePort1 = k ^ 0x300; p_dev->resource[0]->start = k ^ 0x300;
if (!pcmcia_request_io(p_dev, &p_dev->io)) p_dev->io_lines = 16;
if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -448,9 +448,8 @@ static int mhz_mfc_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA; link->conf.Status = CCSR_AUDIO_ENA;
link->io.IOAddrLines = 16; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->end = 8;
link->io.NumPorts2 = 8;
/* The Megahertz combo cards have modem-like CIS entries, so /* The Megahertz combo cards have modem-like CIS entries, so
we have to explicitly try a bunch of port combinations. */ we have to explicitly try a bunch of port combinations. */
@ -601,9 +600,9 @@ static int smc_configcheck(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int smc_config(struct pcmcia_device *link) static int smc_config(struct pcmcia_device *link)
@ -611,7 +610,7 @@ static int smc_config(struct pcmcia_device *link)
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
int i; int i;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
i = pcmcia_loop_config(link, smc_configcheck, NULL); i = pcmcia_loop_config(link, smc_configcheck, NULL);
if (!i) if (!i)
dev->base_addr = link->resource[0]->start; dev->base_addr = link->resource[0]->start;
@ -646,25 +645,25 @@ static int osi_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA; link->conf.Status = CCSR_AUDIO_ENA;
link->io.NumPorts1 = 64; link->resource[0]->end = 64;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts2 = 8; link->resource[1]->end = 8;
link->io.IOAddrLines = 16;
/* Enable Hard Decode, LAN, Modem */ /* Enable Hard Decode, LAN, Modem */
link->conf.ConfigIndex = 0x23; link->conf.ConfigIndex = 0x23;
link->io_lines = 16;
for (i = j = 0; j < 4; j++) { for (i = j = 0; j < 4; j++) {
link->io.BasePort2 = com[j]; link->resource[1]->start = com[j];
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }
if (i != 0) { if (i != 0) {
/* Fallback: turn off hard decode */ /* Fallback: turn off hard decode */
link->conf.ConfigIndex = 0x03; link->conf.ConfigIndex = 0x03;
link->io.NumPorts2 = 0; link->resource[1]->end = 0;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
} }
dev->base_addr = link->resource[0]->start + 0x10; dev->base_addr = link->resource[0]->start + 0x10;
return i; return i;
@ -803,7 +802,7 @@ static int check_sig(struct pcmcia_device *link)
} }
/* Try setting bus width */ /* Try setting bus width */
width = (link->io.Attributes1 == IO_DATA_PATH_WIDTH_AUTO); width = (link->resource[0]->flags == IO_DATA_PATH_WIDTH_AUTO);
s = inb(ioaddr + CONFIG); s = inb(ioaddr + CONFIG);
if (width) if (width)
s |= CFG_16BIT; s |= CFG_16BIT;

34
drivers/net/pcmcia/xirc2ps_cs.c
View File

@ -677,9 +677,9 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev,
if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
p_dev->io.BasePort2 = cf->io.win[0].base; p_dev->resource[1]->start = cf->io.win[0].base;
p_dev->io.BasePort1 = ioaddr; p_dev->resource[0]->start = ioaddr;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }
@ -696,11 +696,11 @@ xirc2ps_config_check(struct pcmcia_device *p_dev,
int *pass = priv_data; int *pass = priv_data;
if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) { if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
p_dev->io.BasePort2 = cf->io.win[0].base; p_dev->resource[1]->start = cf->io.win[0].base;
p_dev->io.BasePort1 = p_dev->io.BasePort2 p_dev->resource[0]->start = p_dev->resource[1]->start
+ (*pass ? (cf->index & 0x20 ? -24:8) + (*pass ? (cf->index & 0x20 ? -24:8)
: (cf->index & 0x20 ? 8:-24)); : (cf->index & 0x20 ? 8:-24));
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -807,8 +807,7 @@ xirc2ps_config(struct pcmcia_device * link)
goto failure; goto failure;
} }
link->io.IOAddrLines =10; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
if (local->modem) { if (local->modem) {
int pass; int pass;
@ -816,16 +815,16 @@ xirc2ps_config(struct pcmcia_device * link)
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status |= CCSR_AUDIO_ENA; link->conf.Status |= CCSR_AUDIO_ENA;
} }
link->io.NumPorts2 = 8; link->resource[1]->end = 8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
if (local->dingo) { if (local->dingo) {
/* Take the Modem IO port from the CIS and scan for a free /* Take the Modem IO port from the CIS and scan for a free
* Ethernet port */ * Ethernet port */
link->io.NumPorts1 = 16; /* no Mako stuff anymore */ link->resource[0]->end = 16; /* no Mako stuff anymore */
if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL)) if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL))
goto port_found; goto port_found;
} else { } else {
link->io.NumPorts1 = 18; link->resource[0]->end = 18;
/* We do 2 passes here: The first one uses the regular mapping and /* We do 2 passes here: The first one uses the regular mapping and
* the second tries again, thereby considering that the 32 ports are * the second tries again, thereby considering that the 32 ports are
* mirrored every 32 bytes. Actually we use a mirrored port for * mirrored every 32 bytes. Actually we use a mirrored port for
@ -840,14 +839,15 @@ xirc2ps_config(struct pcmcia_device * link)
} }
printk(KNOT_XIRC "no ports available\n"); printk(KNOT_XIRC "no ports available\n");
} else { } else {
link->io.NumPorts1 = 16; link->io_lines = 10;
link->resource[0]->end = 16;
for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
link->io.BasePort1 = ioaddr; link->resource[0]->start = ioaddr;
if (!(err=pcmcia_request_io(link, &link->io))) if (!(err = pcmcia_request_io(link)))
goto port_found; goto port_found;
} }
link->io.BasePort1 = 0; /* let CS decide */ link->resource[0]->start = 0; /* let CS decide */
if ((err=pcmcia_request_io(link, &link->io))) if ((err = pcmcia_request_io(link)))
goto config_error; goto config_error;
} }
port_found: port_found:

22
drivers/net/wireless/airo_cs.c
View File

@ -175,25 +175,23 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags |=
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; pcmcia_io_cfg_data_width(io->flags);
if (!(io->flags & CISTPL_IO_16BIT)) p_dev->resource[0]->start = io->win[0].base;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
/* /*

22
drivers/net/wireless/atmel_cs.c
View File

@ -190,25 +190,23 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags |=
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; pcmcia_io_cfg_data_width(io->flags);
if (!(io->flags & CISTPL_IO_16BIT)) p_dev->resource[0]->start = io->win[0].base;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int atmel_config(struct pcmcia_device *link) static int atmel_config(struct pcmcia_device *link)

4
drivers/net/wireless/b43/pcmcia.c
View File

@ -77,10 +77,6 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
dev->conf.Attributes = CONF_ENABLE_IRQ; dev->conf.Attributes = CONF_ENABLE_IRQ;
dev->conf.IntType = INT_MEMORY_AND_IO; dev->conf.IntType = INT_MEMORY_AND_IO;
dev->io.BasePort2 = 0;
dev->io.NumPorts2 = 0;
dev->io.Attributes2 = 0;
win.Attributes = WIN_ADDR_SPACE_MEM | WIN_MEMORY_TYPE_CM | win.Attributes = WIN_ADDR_SPACE_MEM | WIN_MEMORY_TYPE_CM |
WIN_ENABLE | WIN_DATA_WIDTH_16 | WIN_ENABLE | WIN_DATA_WIDTH_16 |
WIN_USE_WAIT; WIN_USE_WAIT;

28
drivers/net/wireless/hostap/hostap_cs.c
View File

@ -519,30 +519,24 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d " PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
"dflt->io.nwin=%d\n", "dflt->io.nwin=%d\n",
cfg->io.nwin, dflt->io.nwin); cfg->io.nwin, dflt->io.nwin);
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, " p_dev->resource[0]->flags |=
"io.base=0x%04x, len=%d\n", io->flags, pcmcia_io_cfg_data_width(io->flags);
io->win[0].base, io->win[0].len); p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->start = io->win[0].base;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->end = io->win[0].len;
if (!(io->flags & CISTPL_IO_16BIT))
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = io->flags &
CISTPL_IO_LINES_MASK;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int prism2_config(struct pcmcia_device *link) static int prism2_config(struct pcmcia_device *link)

8
drivers/net/wireless/libertas/if_cs.c
View File

@ -801,9 +801,9 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->end = cfg->io.win[0].len;
/* Do we need to allocate an interrupt? */ /* Do we need to allocate an interrupt? */
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
@ -815,7 +815,7 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev,
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int if_cs_probe(struct pcmcia_device *p_dev) static int if_cs_probe(struct pcmcia_device *p_dev)

24
drivers/net/wireless/orinoco/orinoco_cs.c
View File

@ -191,25 +191,23 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
goto next_entry; goto next_entry;
} }
return 0; return 0;

24
drivers/net/wireless/orinoco/spectrum_cs.c
View File

@ -253,25 +253,23 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
goto next_entry; goto next_entry;
} }
return 0; return 0;

5
drivers/net/wireless/ray_cs.c
View File

@ -315,9 +315,8 @@ static int ray_probe(struct pcmcia_device *p_dev)
local->finder = p_dev; local->finder = p_dev;
/* The io structure describes IO port mapping. None used here */ /* The io structure describes IO port mapping. None used here */
p_dev->io.NumPorts1 = 0; p_dev->resource[0]->end = 0;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = 5;
/* General socket configuration */ /* General socket configuration */
p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.Attributes = CONF_ENABLE_IRQ;

12
drivers/net/wireless/wl3501_cs.c
View File

@ -1884,9 +1884,8 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
struct wl3501_card *this; struct wl3501_card *this;
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
p_dev->io.NumPorts1 = 16; p_dev->resource[0]->end = 16;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags = IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = 5;
/* General socket configuration */ /* General socket configuration */
p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.Attributes = CONF_ENABLE_IRQ;
@ -1932,13 +1931,14 @@ static int wl3501_config(struct pcmcia_device *link)
/* Try allocating IO ports. This tries a few fixed addresses. If you /* Try allocating IO ports. This tries a few fixed addresses. If you
* want, you can also read the card's config table to pick addresses -- * want, you can also read the card's config table to pick addresses --
* see the serial driver for an example. */ * see the serial driver for an example. */
link->io_lines = 5;
for (j = 0x280; j < 0x400; j += 0x20) { for (j = 0x280; j < 0x400; j += 0x20) {
/* The '^0x300' is so that we probe 0x300-0x3ff first, then /* The '^0x300' is so that we probe 0x300-0x3ff first, then
* 0x200-0x2ff, and so on, because this seems safer */ * 0x200-0x2ff, and so on, because this seems safer */
link->io.BasePort1 = j; link->resource[0]->start = j;
link->io.BasePort2 = link->io.BasePort1 + 0x10; link->resource[1]->start = link->resource[0]->start + 0x10;
i = pcmcia_request_io(link, &link->io); i = pcmcia_request_io(link);
if (i == 0) if (i == 0)
break; break;
} }

16
drivers/parport/parport_cs.c
View File

@ -101,8 +101,8 @@ static int parport_probe(struct pcmcia_device *link)
link->priv = info; link->priv = info;
info->p_dev = link; info->p_dev = link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -143,16 +143,16 @@ static int parport_config_check(struct pcmcia_device *p_dev,
{ {
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (epp_mode) if (epp_mode)
p_dev->conf.ConfigIndex |= FORCE_EPP_MODE; p_dev->conf.ConfigIndex |= FORCE_EPP_MODE;
p_dev->io.BasePort1 = io->win[0].base; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
if (io->nwin == 2) { if (io->nwin == 2) {
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
return 0; return 0;
} }

37
drivers/pcmcia/pcmcia_resource.c
View File

@ -70,7 +70,8 @@ static int alloc_io_space(struct pcmcia_socket *s, struct resource *res,
res->flags |= IORESOURCE_IO; res->flags |= IORESOURCE_IO;
dev_dbg(&s->dev, "alloc_io_space request for %pR\n", res); dev_dbg(&s->dev, "alloc_io_space request for %pR, %d lines\n",
res, lines);
align = base ? (lines ? 1<<lines : 0) : 1; align = base ? (lines ? 1<<lines : 0) : 1;
if (align && (align < num)) { if (align && (align < num)) {
@ -541,38 +542,25 @@ EXPORT_SYMBOL(pcmcia_request_configuration);
* pcmcia_request_io() - attempt to reserve port ranges for PCMCIA devices * pcmcia_request_io() - attempt to reserve port ranges for PCMCIA devices
* *
* pcmcia_request_io() attepts to reserve the IO port ranges specified in * pcmcia_request_io() attepts to reserve the IO port ranges specified in
* struct pcmcia_device *p_dev->resource[0] and *p_dev->resource[1]. The * &struct pcmcia_device @p_dev->resource[0] and @p_dev->resource[1]. The
* "start" value is the requested start of the IO port resource; "end" * "start" value is the requested start of the IO port resource; "end"
* relfects the number of ports requested. * reflects the number of ports requested. The number of IO lines requested
* * is specified in &struct pcmcia_device @p_dev->io_lines.
* If io_req_t is passed, those values are converted automatically.
*/ */
int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req) int pcmcia_request_io(struct pcmcia_device *p_dev)
{ {
struct pcmcia_socket *s = p_dev->socket; struct pcmcia_socket *s = p_dev->socket;
config_t *c; config_t *c = p_dev->function_config;
int ret = -EINVAL; int ret = -EINVAL;
unsigned int lines = req->IOAddrLines;
mutex_lock(&s->ops_mutex); mutex_lock(&s->ops_mutex);
dev_dbg(&s->dev, "pcmcia_request_io: %pR , %pR", &c->io[0], &c->io[1]);
if (!(s->state & SOCKET_PRESENT)) { if (!(s->state & SOCKET_PRESENT)) {
dev_dbg(&s->dev, "pcmcia_request_io: No card present\n"); dev_dbg(&s->dev, "pcmcia_request_io: No card present\n");
goto out; goto out;
} }
c = p_dev->function_config;
if (req) {
c->io[0].start = req->BasePort1;
c->io[0].end = req->NumPorts1;
c->io[0].flags |= req->Attributes1;
c->io[1].start = req->BasePort2;
c->io[1].end = req->NumPorts2;
c->io[1].flags |= req->Attributes2;
}
dev_dbg(&s->dev, "pcmcia_request_io: %pR , %pR", &c->io[0], &c->io[1]);
if (c->state & CONFIG_LOCKED) { if (c->state & CONFIG_LOCKED) {
dev_dbg(&s->dev, "Configuration is locked\n"); dev_dbg(&s->dev, "Configuration is locked\n");
goto out; goto out;
@ -582,12 +570,12 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)
goto out; goto out;
} }
ret = alloc_io_space(s, &c->io[0], lines); ret = alloc_io_space(s, &c->io[0], p_dev->io_lines);
if (ret) if (ret)
goto out; goto out;
if (c->io[1].end) { if (c->io[1].end) {
ret = alloc_io_space(s, &c->io[1], lines); ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);
if (ret) { if (ret) {
release_io_space(s, &c->io[0]); release_io_space(s, &c->io[0]);
goto out; goto out;
@ -598,11 +586,6 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)
c->state |= CONFIG_IO_REQ; c->state |= CONFIG_IO_REQ;
p_dev->_io = 1; p_dev->_io = 1;
if (!ret) {
req->BasePort1 = c->io[0].start;
req->BasePort2 = c->io[1].start;
}
dev_dbg(&s->dev, "pcmcia_request_io succeeded: %pR , %pR", dev_dbg(&s->dev, "pcmcia_request_io succeeded: %pR , %pR",
&c->io[0], &c->io[1]); &c->io[0], &c->io[1]);
out: out:

14
drivers/scsi/pcmcia/aha152x_stub.c
View File

@ -100,9 +100,8 @@ static int aha152x_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.NumPorts1 = 0x20; link->resource[0]->end = 0x20;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION; link->conf.Present = PRESENT_OPTION;
@ -130,15 +129,16 @@ static int aha152x_config_check(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io_lines = 10;
/* For New Media T&J, look for a SCSI window */ /* For New Media T&J, look for a SCSI window */
if (cfg->io.win[0].len >= 0x20) if (cfg->io.win[0].len >= 0x20)
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->resource[0]->start = cfg->io.win[0].base;
else if ((cfg->io.nwin > 1) && else if ((cfg->io.nwin > 1) &&
(cfg->io.win[1].len >= 0x20)) (cfg->io.win[1].len >= 0x20))
p_dev->io.BasePort1 = cfg->io.win[1].base; p_dev->resource[0]->start = cfg->io.win[1].base;
if ((cfg->io.nwin > 0) && if ((cfg->io.nwin > 0) &&
(p_dev->io.BasePort1 < 0xffff)) { (p_dev->resource[0]->start < 0xffff)) {
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
return -EINVAL; return -EINVAL;

10
drivers/scsi/pcmcia/fdomain_stub.c
View File

@ -83,9 +83,8 @@ static int fdomain_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.NumPorts1 = 0x10; link->resource[0]->end = 0x10;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION; link->conf.Present = PRESENT_OPTION;
@ -112,8 +111,9 @@ static int fdomain_config_check(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->io_lines = 10;
return pcmcia_request_io(p_dev, &p_dev->io); p_dev->resource[0]->start = cfg->io.win[0].base;
return pcmcia_request_io(p_dev);
} }

30
drivers/scsi/pcmcia/nsp_cs.c
View File

@ -1558,9 +1558,8 @@ static int nsp_cs_probe(struct pcmcia_device *link)
nsp_dbg(NSP_DEBUG_INIT, "info=0x%p", info); nsp_dbg(NSP_DEBUG_INIT, "info=0x%p", info);
/* The io structure describes IO port mapping */ /* The io structure describes IO port mapping */
link->io.NumPorts1 = 0x10; link->resource[0]->end = 0x10;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags = IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10; /* not used */
/* General socket configuration */ /* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
@ -1641,24 +1640,23 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags =
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[0]->flags;
p_dev->io.NumPorts2 = io->win[1].len; 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 */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
goto next_entry; goto next_entry;
} }

14
drivers/scsi/pcmcia/qlogic_stub.c
View File

@ -156,9 +156,8 @@ static int qlogic_probe(struct pcmcia_device *link)
return -ENOMEM; return -ENOMEM;
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION; link->conf.Present = PRESENT_OPTION;
@ -185,13 +184,14 @@ static int qlogic_config_check(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->io_lines = 10;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->resource[0]->end = cfg->io.win[0].len;
if (p_dev->io.BasePort1 == 0) if (p_dev->resource[0]->start == 0)
return -ENODEV; return -ENODEV;
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int qlogic_config(struct pcmcia_device * link) static int qlogic_config(struct pcmcia_device * link)

14
drivers/scsi/pcmcia/sym53c500_cs.c
View File

@ -690,13 +690,14 @@ static int SYM53C500_config_check(struct pcmcia_device *p_dev,
unsigned int vcc, unsigned int vcc,
void *priv_data) void *priv_data)
{ {
p_dev->io.BasePort1 = cfg->io.win[0].base; p_dev->io_lines = 10;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->start = cfg->io.win[0].base;
p_dev->resource[0]->end = cfg->io.win[0].len;
if (p_dev->io.BasePort1 == 0) if (p_dev->resource[0]->start == 0)
return -ENODEV; return -ENODEV;
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static int static int
@ -858,9 +859,8 @@ SYM53C500_probe(struct pcmcia_device *link)
return -ENOMEM; return -ENOMEM;
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;

37
drivers/serial/serial_cs.c
View File

@ -335,8 +335,8 @@ static int serial_probe(struct pcmcia_device *link)
info->p_dev = link; info->p_dev = link;
link->priv = info; link->priv = info;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
link->io.NumPorts1 = 8; link->resource[0]->end = 8;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
if (do_sound) { if (do_sound) {
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
@ -424,12 +424,13 @@ static int simple_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Vpp = p_dev->conf.Vpp =
cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
p_dev->io_lines = ((*try & 0x1) == 0) ?
16 : cf->io.flags & CISTPL_IO_LINES_MASK;
if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[(*try >> 1)]) if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[(*try >> 1)])
&& (cf->io.win[0].base != 0)) { && (cf->io.win[0].base != 0)) {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.IOAddrLines = ((*try & 0x1) == 0) ? if (!pcmcia_request_io(p_dev))
16 : cf->io.flags & CISTPL_IO_LINES_MASK;
if (!pcmcia_request_io(p_dev, &p_dev->io))
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
@ -446,9 +447,9 @@ static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
for (j = 0; j < 5; j++) { for (j = 0; j < 5; j++) {
p_dev->io.BasePort1 = base[j]; p_dev->resource[0]->start = base[j];
p_dev->io.IOAddrLines = base[j] ? 16 : 3; p_dev->io_lines = base[j] ? 16 : 3;
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
} }
@ -521,9 +522,9 @@ static int multi_config_check(struct pcmcia_device *p_dev,
/* The quad port cards have bad CIS's, so just look for a /* The quad port cards have bad CIS's, so just look for a
window larger than 8 ports and assume it will be right */ window larger than 8 ports and assume it will be right */
if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) { if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
if (!pcmcia_request_io(p_dev, &p_dev->io)) { if (!pcmcia_request_io(p_dev)) {
*base2 = p_dev->resource[0]->start + 8; *base2 = p_dev->resource[0]->start + 8;
return 0; return 0;
} }
@ -540,10 +541,10 @@ static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
int *base2 = priv_data; int *base2 = priv_data;
if (cf->io.nwin == 2) { if (cf->io.nwin == 2) {
p_dev->io.BasePort1 = cf->io.win[0].base; p_dev->resource[0]->start = cf->io.win[0].base;
p_dev->io.BasePort2 = cf->io.win[1].base; p_dev->resource[1]->start = cf->io.win[1].base;
p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
if (!pcmcia_request_io(p_dev, &p_dev->io)) { if (!pcmcia_request_io(p_dev)) {
*base2 = p_dev->resource[1]->start; *base2 = p_dev->resource[1]->start;
return 0; return 0;
} }
@ -557,10 +558,10 @@ static int multi_config(struct pcmcia_device *link)
int i, base2 = 0; int i, base2 = 0;
/* First, look for a generic full-sized window */ /* First, look for a generic full-sized window */
link->io.NumPorts1 = info->multi * 8; link->resource[0]->end = info->multi * 8;
if (pcmcia_loop_config(link, multi_config_check, &base2)) { if (pcmcia_loop_config(link, multi_config_check, &base2)) {
/* If that didn't work, look for two windows */ /* If that didn't work, look for two windows */
link->io.NumPorts1 = link->io.NumPorts2 = 8; link->resource[0]->end = link->resource[1]->end = 8;
info->multi = 2; info->multi = 2;
if (pcmcia_loop_config(link, multi_config_check_notpicky, if (pcmcia_loop_config(link, multi_config_check_notpicky,
&base2)) { &base2)) {

24
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@ -736,24 +736,22 @@ static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
return 0; return 0;

23
drivers/staging/comedi/drivers/das08_cs.c
View File

@ -224,24 +224,23 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
p_dev->io.BasePort1 = io->win[0].base; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len; p_dev->resource[0]->end = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
return 0; return 0;
} }

24
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@ -571,24 +571,22 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
} }

24
drivers/staging/comedi/drivers/ni_daq_dio24.c
View File

@ -323,24 +323,22 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
} }

24
drivers/staging/comedi/drivers/ni_labpc_cs.c
View File

@ -301,24 +301,22 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
if (pcmcia_request_io(p_dev, &p_dev->io) != 0) if (pcmcia_request_io(p_dev) != 0)
return -ENODEV; return -ENODEV;
} }

13
drivers/staging/comedi/drivers/ni_mio_cs.c
View File

@ -264,8 +264,8 @@ static const dev_info_t dev_info = "ni_mio_cs";
static int cs_attach(struct pcmcia_device *link) static int cs_attach(struct pcmcia_device *link)
{ {
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -310,13 +310,12 @@ static int mio_pcmcia_config_loop(struct pcmcia_device *p_dev,
{ {
int base, ret; int base, ret;
p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->resource[0]->end = cfg->io.win[0].len;
p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
p_dev->io.NumPorts2 = 0;
for (base = 0x000; base < 0x400; base += 0x20) { for (base = 0x000; base < 0x400; base += 0x20) {
p_dev->io.BasePort1 = base; p_dev->resource[0]->start = base;
ret = pcmcia_request_io(p_dev, &p_dev->io); ret = pcmcia_request_io(p_dev);
if (!ret) if (!ret)
return 0; return 0;
} }

24
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View File

@ -1102,26 +1102,24 @@ static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
if (!(io->flags & CISTPL_IO_8BIT)) p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; p_dev->resource[0]->flags |=
if (!(io->flags & CISTPL_IO_16BIT)) pcmcia_io_cfg_data_width(io->flags);
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.BasePort1 = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len;
if (io->nwin > 1) { if (io->nwin > 1) {
p_dev->io.Attributes2 = p_dev->io.Attributes1; p_dev->resource[1]->flags = p_dev->resource[0]->flags;
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
} }
/* This reserves IO space but doesn't actually enable it */ /* This reserves IO space but doesn't actually enable it */
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
static void daqp_cs_config(struct pcmcia_device *link) static void daqp_cs_config(struct pcmcia_device *link)

8
drivers/staging/wlags49_h2/wl_cs.c
View File

@ -145,9 +145,8 @@ static int wl_adapter_attach(struct pcmcia_device *link)
return -ENOMEM; return -ENOMEM;
} }
link->io.NumPorts1 = HCF_NUM_IO_PORTS; link->resource[0]->end = HCF_NUM_IO_PORTS;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; link->resource[0]->flags = IO_DATA_PATH_WIDTH_16;
link->io.IOAddrLines = 6;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 5; link->conf.ConfigIndex = 5;
@ -305,8 +304,9 @@ void wl_adapter_insert( struct pcmcia_device *link )
/* Do we need to allocate an interrupt? */ /* Do we need to allocate an interrupt? */
link->conf.Attributes |= CONF_ENABLE_IRQ; link->conf.Attributes |= CONF_ENABLE_IRQ;
link->io_lines = 6;
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret != 0) if (ret != 0)
goto failed; goto failed;

16
drivers/telephony/ixj_pcmcia.c
View File

@ -32,9 +32,8 @@ static int ixj_probe(struct pcmcia_device *p_dev)
{ {
dev_dbg(&p_dev->dev, "ixj_attach()\n"); dev_dbg(&p_dev->dev, "ixj_attach()\n");
/* Create new ixj device */ /* Create new ixj device */
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = 3;
p_dev->conf.IntType = INT_MEMORY_AND_IO; p_dev->conf.IntType = INT_MEMORY_AND_IO;
p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL); p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
if (!p_dev->priv) { if (!p_dev->priv) {
@ -120,13 +119,14 @@ static int ixj_config_check(struct pcmcia_device *p_dev,
{ {
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io.BasePort1 = io->win[0].base; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.NumPorts1 = io->win[0].len; p_dev->resource[0]->end = io->win[0].len;
p_dev->io_lines = 3;
if (io->nwin == 2) { if (io->nwin == 2) {
p_dev->io.BasePort2 = io->win[1].base; p_dev->resource[1]->start = io->win[1].base;
p_dev->io.NumPorts2 = io->win[1].len; p_dev->resource[1]->end = io->win[1].len;
} }
if (!pcmcia_request_io(p_dev, &p_dev->io)) if (!pcmcia_request_io(p_dev))
return 0; return 0;
} }
return -ENODEV; return -ENODEV;

12
drivers/usb/host/sl811_cs.c
View File

@ -162,16 +162,16 @@ static int sl811_cs_config_check(struct pcmcia_device *p_dev,
p_dev->conf.Attributes |= CONF_ENABLE_IRQ; p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
/* IO window settings */ /* IO window settings */
p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->start = io->win[0].base;
p_dev->io.BasePort1 = io->win[0].base; p_dev->resource[0]->end = io->win[0].len;
p_dev->io.NumPorts1 = io->win[0].len;
return pcmcia_request_io(p_dev, &p_dev->io); return pcmcia_request_io(p_dev);
} }
pcmcia_disable_device(p_dev); pcmcia_disable_device(p_dev);
return -ENODEV; return -ENODEV;

17
include/pcmcia/cs.h
View File

@ -56,23 +56,6 @@ typedef struct config_req_t {
#define INT_CARDBUS 0x04 #define INT_CARDBUS 0x04
#define INT_ZOOMED_VIDEO 0x08 #define INT_ZOOMED_VIDEO 0x08
/* For RequestIO and ReleaseIO */
typedef struct io_req_t {
u_int BasePort1;
u_int NumPorts1;
u_int Attributes1;
u_int BasePort2;
u_int NumPorts2;
u_int Attributes2;
u_int IOAddrLines;
} io_req_t;
/* Attributes for RequestIO and ReleaseIO */
#define IO_DATA_PATH_WIDTH 0x18
#define IO_DATA_PATH_WIDTH_8 0x00
#define IO_DATA_PATH_WIDTH_16 0x08
#define IO_DATA_PATH_WIDTH_AUTO 0x10
/* Bits in IRQInfo1 field */ /* Bits in IRQInfo1 field */
#define IRQ_NMI_ID 0x01 #define IRQ_NMI_ID 0x01
#define IRQ_IOCK_ID 0x02 #define IRQ_IOCK_ID 0x02

21
include/pcmcia/ds.h
View File

@ -80,7 +80,6 @@ struct pcmcia_device {
struct list_head socket_device_list; struct list_head socket_device_list;
/* deprecated, will be cleaned up soon */ /* deprecated, will be cleaned up soon */
io_req_t io;
config_req_t conf; config_req_t conf;
window_handle_t win; window_handle_t win;
@ -88,6 +87,8 @@ struct pcmcia_device {
unsigned int irq; unsigned int irq;
struct resource *resource[MAX_IO_WIN]; struct resource *resource[MAX_IO_WIN];
unsigned int io_lines; /* number of I/O lines */
/* Is the device suspended? */ /* Is the device suspended? */
u16 suspended:1; u16 suspended:1;
@ -179,7 +180,7 @@ int pcmcia_read_config_byte(struct pcmcia_device *p_dev, off_t where, u8 *val);
int pcmcia_write_config_byte(struct pcmcia_device *p_dev, off_t where, u8 val); int pcmcia_write_config_byte(struct pcmcia_device *p_dev, off_t where, u8 val);
/* device configuration */ /* device configuration */
int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); int pcmcia_request_io(struct pcmcia_device *p_dev);
int __must_check int __must_check
__pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev, __pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev,
@ -206,6 +207,22 @@ int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
void pcmcia_disable_device(struct pcmcia_device *p_dev); void pcmcia_disable_device(struct pcmcia_device *p_dev);
/* IO ports */
#define IO_DATA_PATH_WIDTH 0x18
#define IO_DATA_PATH_WIDTH_8 0x00
#define IO_DATA_PATH_WIDTH_16 0x08
#define IO_DATA_PATH_WIDTH_AUTO 0x10
/* convert flag found in cfgtable to data path width parameter */
static inline int pcmcia_io_cfg_data_width(unsigned int flags)
{
if (!(flags & CISTPL_IO_8BIT))
return IO_DATA_PATH_WIDTH_16;
if (!(flags & CISTPL_IO_16BIT))
return IO_DATA_PATH_WIDTH_8;
return IO_DATA_PATH_WIDTH_AUTO;
}
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _LINUX_DS_H */ #endif /* _LINUX_DS_H */

6
sound/pcmcia/pdaudiocf/pdaudiocf.c
View File

@ -139,8 +139,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
pdacf->p_dev = link; pdacf->p_dev = link;
link->priv = pdacf; link->priv = pdacf;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -219,7 +219,7 @@ static int pdacf_config(struct pcmcia_device *link)
snd_printdd(KERN_DEBUG "pdacf_config called\n"); snd_printdd(KERN_DEBUG "pdacf_config called\n");
link->conf.ConfigIndex = 0x5; link->conf.ConfigIndex = 0x5;
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret) if (ret)
goto failed; goto failed;

6
sound/pcmcia/vx/vxpocket.c
View File

@ -159,8 +159,8 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
vxp->p_dev = link; vxp->p_dev = link;
link->priv = chip; link->priv = chip;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
link->io.NumPorts1 = 16; link->resource[0]->end = 16;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
@ -226,7 +226,7 @@ static int vxpocket_config(struct pcmcia_device *link)
strcpy(chip->card->driver, vxp440_hw.name); strcpy(chip->card->driver, vxp440_hw.name);
} }
ret = pcmcia_request_io(link, &link->io); ret = pcmcia_request_io(link);
if (ret) if (ret)
goto failed; goto failed;