Commit 7d2e8d00 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use pre-determined values 



A few PCMCIA network drivers can make use of values provided by the pcmcia
core, instead of tedious, independent CIS parsing.

xirc32ps_cs.c: manf_id

hostap_cs.c: multifunction count

b43/pcmcia.c: ConfigBase address and "Present"

smc91c92_cs.c:  By default, mhz_setup() can use VERS_1 as it is stored
in struct pcmcia_device. Only some cards require workarounds, such as
reading out VERS_1 twice.

CC: David S. Miller <davem@davemloft.net>
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
Acked-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 6ae3b84d

drivers/net/pcmcia/smc91c92_cs.c

+9 −2
Original line number Diff line number Diff line
@@ -545,6 +545,14 @@ static int mhz_setup(struct pcmcia_device *link) 
    u_char *buf, *station_addr;

    int rc;



    /* Read the station address from the CIS.  It is stored as the last

       (fourth) string in the Version 1 Version/ID tuple. */

    if ((link->prod_id[3]) &&

	(cvt_ascii_address(dev, link->prod_id[3]) == 0))

	    return 0;



    /* Workarounds for broken cards start here. */



    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);

    if (!cfg_mem)

	return -1;
@@ -557,8 +565,7 @@ static int mhz_setup(struct pcmcia_device *link) 
    tuple->TupleData = (cisdata_t *)buf;

    tuple->TupleDataMax = 255;



    /* Read the station address from the CIS.  It is stored as the last

       (fourth) string in the Version 1 Version/ID tuple. */

    /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */

    tuple->DesiredTuple = CISTPL_VERS_1;

    if (first_tuple(link, tuple, parse) != 0) {

	rc = -1;

drivers/net/pcmcia/xirc2ps_cs.c

+9 −3
Original line number Diff line number Diff line
@@ -792,13 +792,12 @@ xirc2ps_config(struct pcmcia_device * link) 
    tuple.TupleOffset = 0;



    /* Is this a valid	card */

    tuple.DesiredTuple = CISTPL_MANFID;

    if ((err=first_tuple(link, &tuple, &parse))) {

    if (link->has_manf_id == 0) {

	printk(KNOT_XIRC "manfid not found in CIS\n");

	goto failure;

    }



    switch(parse.manfid.manf) {

    switch (link->manf_id) {

      case MANFID_XIRCOM:

	local->manf_str = "Xircom";

	break;
@@ -822,6 +821,13 @@ xirc2ps_config(struct pcmcia_device * link) 
    }

    DEBUG(0, "found %s card\n", local->manf_str);



    /* needed for the additional fields to be parsed by set_card_type() */

    tuple.DesiredTuple = CISTPL_MANFID;

    err = first_tuple(link, &tuple, &parse)

    if (err) {

	printk(KNOT_XIRC "manfid not found in CIS\n");

	goto failure;

    }

    if (!set_card_type(link, buf)) {

	printk(KNOT_XIRC "this card is not supported\n");

	goto failure;

drivers/net/wireless/b43/pcmcia.c

+0 −20
Original line number Diff line number Diff line
@@ -65,35 +65,15 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) 
	struct ssb_bus *ssb;

	win_req_t win;

	memreq_t mem;

	tuple_t tuple;

	cisparse_t parse;

	int err = -ENOMEM;

	int res = 0;

	unsigned char buf[64];



	ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);

	if (!ssb)

		goto out_error;



	err = -ENODEV;

	tuple.DesiredTuple = CISTPL_CONFIG;

	tuple.Attributes = 0;

	tuple.TupleData = buf;

	tuple.TupleDataMax = sizeof(buf);

	tuple.TupleOffset = 0;



	res = pcmcia_get_first_tuple(dev, &tuple);

	if (res != 0)

		goto err_kfree_ssb;

	res = pcmcia_get_tuple_data(dev, &tuple);

	if (res != 0)

		goto err_kfree_ssb;

	res = pcmcia_parse_tuple(&tuple, &parse);

	if (res != 0)

		goto err_kfree_ssb;



	dev->conf.ConfigBase = parse.config.base;

	dev->conf.Present = parse.config.rmask[0];

	dev->conf.Attributes = CONF_ENABLE_IRQ;

	dev->conf.IntType = INT_MEMORY_AND_IO;

drivers/net/wireless/hostap/hostap_cs.c

+1 −20
Original line number Diff line number Diff line
@@ -274,9 +274,6 @@ static int sandisk_enable_wireless(struct net_device *dev) 
	conf_reg_t reg;

	struct hostap_interface *iface = netdev_priv(dev);

	local_info_t *local = iface->local;

	tuple_t tuple;

	cisparse_t *parse = NULL;

	u_char buf[64];

	struct hostap_cs_priv *hw_priv = local->hw_priv;



	if (hw_priv->link->io.NumPorts1 < 0x42) {
@@ -285,28 +282,13 @@ static int sandisk_enable_wireless(struct net_device *dev) 
		goto done;

	}



	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);

	if (parse == NULL) {

		ret = -ENOMEM;

		goto done;

	}



	tuple.Attributes = TUPLE_RETURN_COMMON;

	tuple.TupleData = buf;

	tuple.TupleDataMax = sizeof(buf);

	tuple.TupleOffset = 0;



	if (hw_priv->link->manf_id != 0xd601 || hw_priv->link->card_id != 0x0101) {

		/* No SanDisk manfid found */

		ret = -ENODEV;

		goto done;

	}



	tuple.DesiredTuple = CISTPL_LONGLINK_MFC;

	if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||

	    pcmcia_get_tuple_data(hw_priv->link, &tuple) ||

	    pcmcia_parse_tuple(&tuple, parse) ||

		parse->longlink_mfc.nfn < 2) {

	if (hw_priv->link->socket->functions < 2) {

		/* No multi-function links found */

		ret = -ENODEV;

		goto done;
@@ -354,7 +336,6 @@ static int sandisk_enable_wireless(struct net_device *dev) 
	udelay(10);



done:

	kfree(parse);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE