Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90abdc3b authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 9a017a91

Documentation/pcmcia/driver-changes.txt

+7 −0
Original line number Diff line number Diff line 
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)

   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

drivers/ata/pata_pcmcia.c

+15 −14
Original line number Diff line number Diff line
@@ -200,21 +200,23 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, 


	if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {

		cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;

		pdev->io.BasePort1 = io->win[0].base;

		pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;

		if (!(io->flags & CISTPL_IO_16BIT))

			pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

		pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;

		pdev->resource[0]->start = io->win[0].base;

		if (!(io->flags & CISTPL_IO_16BIT)) {

			pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

			pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

		}

		if (io->nwin == 2) {

			pdev->io.NumPorts1 = 8;

			pdev->io.BasePort2 = io->win[1].base;

			pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;

			if (pcmcia_request_io(pdev, &pdev->io) != 0)

			pdev->resource[0]->end = 8;

			pdev->resource[1]->start = io->win[1].base;

			pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;

			if (pcmcia_request_io(pdev) != 0)

				return -ENODEV;

			stk->ctl_base = pdev->resource[1]->start;

		} else if ((io->nwin == 1) && (io->win[0].len >= 16)) {

			pdev->io.NumPorts1 = io->win[0].len;

			pdev->io.NumPorts2 = 0;

			if (pcmcia_request_io(pdev, &pdev->io) != 0)

			pdev->resource[0]->end = io->win[0].len;

			pdev->resource[1]->end = 0;

			if (pcmcia_request_io(pdev) != 0)

				return -ENODEV;

			stk->ctl_base = pdev->resource[0]->start + 0x0e;

		} else
@@ -245,9 +247,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	struct ata_port_operations *ops = &pcmcia_port_ops;



	/* Set up attributes in order to probe card and get resources */

	pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;

	pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8;

	pdev->io.IOAddrLines = 3;

	pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;

	pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;

	pdev->conf.Attributes = CONF_ENABLE_IRQ;

	pdev->conf.IntType = INT_MEMORY_AND_IO;

drivers/bluetooth/bluecard_cs.c

+6 −7
Original line number Diff line number Diff line
@@ -865,9 +865,6 @@ static int bluecard_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;
@@ -890,12 +887,14 @@ static int bluecard_config(struct pcmcia_device *link) 
	int i, n;



	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) {

		link->io.BasePort1 = n ^ 0x300;

		i = pcmcia_request_io(link, &link->io);

		link->resource[0]->start = n ^ 0x300;

		i = pcmcia_request_io(link);

		if (i == 0)

			break;

	}

drivers/bluetooth/bt3c_cs.c

+9 −9
Original line number Diff line number Diff line
@@ -657,8 +657,8 @@ static int bt3c_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	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;



	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;



	if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

		p_dev->io.BasePort1 = cf->io.win[0].base;

		p_dev->io.IOAddrLines = (try == 0) ? 16 :

			cf->io.flags & CISTPL_IO_LINES_MASK;

		if (!pcmcia_request_io(p_dev, &p_dev->io))

		p_dev->resource[0]->start = cf->io.win[0].base;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	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)) {

		for (j = 0; j < 5; j++) {

			p_dev->io.BasePort1 = base[j];

			p_dev->io.IOAddrLines = base[j] ? 16 : 3;

			if (!pcmcia_request_io(p_dev, &p_dev->io))

			p_dev->resource[0]->start = base[j];

			p_dev->io_lines = base[j] ? 16 : 3;

			if (!pcmcia_request_io(p_dev))

				return 0;

		}

	}

drivers/bluetooth/btuart_cs.c

+9 −9
Original line number Diff line number Diff line
@@ -586,8 +586,8 @@ static int btuart_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	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;



	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;



	if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

		p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

		p_dev->io.BasePort1 = cf->io.win[0].base;

		p_dev->io.IOAddrLines = (*try == 0) ? 16 :

			cf->io.flags & CISTPL_IO_LINES_MASK;

		if (!pcmcia_request_io(p_dev, &p_dev->io))

		p_dev->resource[0]->start = cf->io.win[0].base;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	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)) {

		for (j = 0; j < 5; j++) {

			p_dev->io.BasePort1 = base[j];

			p_dev->io.IOAddrLines = base[j] ? 16 : 3;

			if (!pcmcia_request_io(p_dev, &p_dev->io))

			p_dev->resource[0]->start = base[j];

			p_dev->io_lines = base[j] ? 16 : 3;

			if (!pcmcia_request_io(p_dev))

				return 0;

		}

	}