smsc: Move the SMC (SMSC) drivers

Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the
necessary Kconfig and Makefile changes.  Also did some cleanup
of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.

CC: Nicolas Pitre <nico@fluxnic.net>
CC: Donald Becker <becker@scyld.com>
CC: Erik Stahlman <erik@vt.edu>
CC: Dustin McIntire <dustin@sensoria.com>
CC: Steve Glendinning <steve.glendinning@smsc.com>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

3 files changed, 0 insertions, 2082 deletions

diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 72aa25786a9..f5a738ff59f 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -31,17 +31,6 @@ config PCMCIA_FMVJ18X
 	  To compile this driver as a module, choose M here: the module will be
 	  called fmvj18x_cs.  If unsure, say N.
 
-config PCMCIA_SMC91C92
-	tristate "SMC 91Cxx PCMCIA support"
-	select CRC32
-	select MII
-	help
-	  Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
-	  (PC-card) Ethernet or Fast Ethernet card to your computer.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called smc91c92_cs.  If unsure, say N.
-
 config PCMCIA_XIRC2PS
 	tristate "Xircom 16-bit PCMCIA support"
 	help
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index c2b8b44c7bb..f9c98836d75 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -4,7 +4,6 @@
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_FMVJ18X)	+= fmvj18x_cs.o
-obj-$(CONFIG_PCMCIA_SMC91C92)	+= smc91c92_cs.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)	+= xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
 
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
deleted file mode 100644
index cffbc0373fa..00000000000
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ /dev/null
@@ -1,2070 +0,0 @@
-/*======================================================================
-
-    A PCMCIA ethernet driver for SMC91c92-based cards.
-
-    This driver supports Megahertz PCMCIA ethernet cards; and
-    Megahertz, Motorola, Ositech, and Psion Dacom ethernet/modem
-    multifunction cards.
-
-    Copyright (C) 1999 David A. Hinds -- dahinds@users.sourceforge.net
-
-    smc91c92_cs.c 1.122 2002/10/25 06:26:39
-
-    This driver contains code written by Donald Becker
-    (becker@scyld.com), Rowan Hughes (x-csrdh@jcu.edu.au),
-    David Hinds (dahinds@users.sourceforge.net), and Erik Stahlman
-    (erik@vt.edu).  Donald wrote the SMC 91c92 code using parts of
-    Erik's SMC 91c94 driver.  Rowan wrote a similar driver, and I've
-    incorporated some parts of his driver here.  I (Dave) wrote most
-    of the PCMCIA glue code, and the Ositech support code.  Kelly
-    Stephens (kstephen@holli.com) added support for the Motorola
-    Mariner, with help from Allen Brost.
-
-    This software may be used and distributed according to the terms of
-    the GNU General Public License, incorporated herein by reference.
-
-======================================================================*/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/crc32.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/if_arp.h>
-#include <linux/ioport.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-#include <linux/jiffies.h>
-#include <linux/firmware.h>
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/cisreg.h>
-#include <pcmcia/ciscode.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/ss.h>
-
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-/*====================================================================*/
-
-static const char *if_names[] = { "auto", "10baseT", "10base2"};
-
-/* Firmware name */
-#define FIRMWARE_NAME		"ositech/Xilinx7OD.bin"
-
-/* Module parameters */
-
-MODULE_DESCRIPTION("SMC 91c92 series PCMCIA ethernet driver");
-MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(FIRMWARE_NAME);
-
-#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
-
-/*
-  Transceiver/media type.
-   0 = auto
-   1 = 10baseT (and autoselect if #define AUTOSELECT),
-   2 = AUI/10base2,
-*/
-INT_MODULE_PARM(if_port, 0);
-
-
-#define DRV_NAME	"smc91c92_cs"
-#define DRV_VERSION	"1.123"
-
-/*====================================================================*/
-
-/* Operational parameter that usually are not changed. */
-
-/* Time in jiffies before concluding Tx hung */
-#define TX_TIMEOUT		((400*HZ)/1000)
-
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-#define INTR_WORK		4
-
-/* Times to check the check the chip before concluding that it doesn't
-   currently have room for another Tx packet. */
-#define MEMORY_WAIT_TIME       	8
-
-struct smc_private {
-	struct pcmcia_device	*p_dev;
-    spinlock_t			lock;
-    u_short			manfid;
-    u_short			cardid;
-
-    struct sk_buff		*saved_skb;
-    int				packets_waiting;
-    void			__iomem *base;
-    u_short			cfg;
-    struct timer_list		media;
-    int				watchdog, tx_err;
-    u_short			media_status;
-    u_short			fast_poll;
-    u_short			link_status;
-    struct mii_if_info		mii_if;
-    int				duplex;
-    int				rx_ovrn;
-};
-
-/* Special definitions for Megahertz multifunction cards */
-#define MEGAHERTZ_ISR		0x0380
-
-/* Special function registers for Motorola Mariner */
-#define MOT_LAN			0x0000
-#define MOT_UART		0x0020
-#define MOT_EEPROM		0x20
-
-#define MOT_NORMAL \
-(COR_LEVEL_REQ | COR_FUNC_ENA | COR_ADDR_DECODE | COR_IREQ_ENA)
-
-/* Special function registers for Ositech cards */
-#define OSITECH_AUI_CTL		0x0c
-#define OSITECH_PWRDOWN		0x0d
-#define OSITECH_RESET		0x0e
-#define OSITECH_ISR		0x0f
-#define OSITECH_AUI_PWR		0x0c
-#define OSITECH_RESET_ISR	0x0e
-
-#define OSI_AUI_PWR		0x40
-#define OSI_LAN_PWRDOWN		0x02
-#define OSI_MODEM_PWRDOWN	0x01
-#define OSI_LAN_RESET		0x02
-#define OSI_MODEM_RESET		0x01
-
-/* Symbolic constants for the SMC91c9* series chips, from Erik Stahlman. */
-#define	BANK_SELECT		14		/* Window select register. */
-#define SMC_SELECT_BANK(x)  { outw(x, ioaddr + BANK_SELECT); }
-
-/* Bank 0 registers. */
-#define	TCR 		0	/* transmit control register */
-#define	 TCR_CLEAR	0	/* do NOTHING */
-#define  TCR_ENABLE	0x0001	/* if this is 1, we can transmit */
-#define	 TCR_PAD_EN	0x0080	/* pads short packets to 64 bytes */
-#define  TCR_MONCSN	0x0400  /* Monitor Carrier. */
-#define  TCR_FDUPLX	0x0800  /* Full duplex mode. */
-#define	 TCR_NORMAL TCR_ENABLE | TCR_PAD_EN
-
-#define EPH		2	/* Ethernet Protocol Handler report. */
-#define  EPH_TX_SUC	0x0001
-#define  EPH_SNGLCOL	0x0002
-#define  EPH_MULCOL	0x0004
-#define  EPH_LTX_MULT	0x0008
-#define  EPH_16COL	0x0010
-#define  EPH_SQET	0x0020
-#define  EPH_LTX_BRD	0x0040
-#define  EPH_TX_DEFR	0x0080
-#define  EPH_LAT_COL	0x0200
-#define  EPH_LOST_CAR	0x0400
-#define  EPH_EXC_DEF	0x0800
-#define  EPH_CTR_ROL	0x1000
-#define  EPH_RX_OVRN	0x2000
-#define  EPH_LINK_OK	0x4000
-#define  EPH_TX_UNRN	0x8000
-#define MEMINFO		8	/* Memory Information Register */
-#define MEMCFG		10	/* Memory Configuration Register */
-
-/* Bank 1 registers. */
-#define CONFIG			0
-#define  CFG_MII_SELECT		0x8000	/* 91C100 only */
-#define  CFG_NO_WAIT		0x1000
-#define  CFG_FULL_STEP		0x0400
-#define  CFG_SET_SQLCH		0x0200
-#define  CFG_AUI_SELECT	 	0x0100
-#define  CFG_16BIT		0x0080
-#define  CFG_DIS_LINK		0x0040
-#define  CFG_STATIC		0x0030
-#define  CFG_IRQ_SEL_1		0x0004
-#define  CFG_IRQ_SEL_0		0x0002
-#define BASE_ADDR		2
-#define	ADDR0			4
-#define	GENERAL			10
-#define	CONTROL			12
-#define  CTL_STORE		0x0001
-#define  CTL_RELOAD		0x0002
-#define  CTL_EE_SELECT		0x0004
-#define  CTL_TE_ENABLE		0x0020
-#define  CTL_CR_ENABLE		0x0040
-#define  CTL_LE_ENABLE		0x0080
-#define  CTL_AUTO_RELEASE	0x0800
-#define	 CTL_POWERDOWN		0x2000
-
-/* Bank 2 registers. */
-#define MMU_CMD		0
-#define	 MC_ALLOC	0x20  	/* or with number of 256 byte packets */
-#define	 MC_RESET	0x40
-#define  MC_RELEASE  	0x80  	/* remove and release the current rx packet */
-#define  MC_FREEPKT  	0xA0  	/* Release packet in PNR register */
-#define  MC_ENQUEUE	0xC0 	/* Enqueue the packet for transmit */
-#define	PNR_ARR		2
-#define FIFO_PORTS	4
-#define  FP_RXEMPTY	0x8000
-#define	POINTER		6
-#define  PTR_AUTO_INC	0x0040
-#define  PTR_READ	0x2000
-#define	 PTR_AUTOINC 	0x4000
-#define	 PTR_RCV	0x8000
-#define	DATA_1		8
-#define	INTERRUPT	12
-#define  IM_RCV_INT		0x1
-#define	 IM_TX_INT		0x2
-#define	 IM_TX_EMPTY_INT	0x4
-#define	 IM_ALLOC_INT		0x8
-#define	 IM_RX_OVRN_INT		0x10
-#define	 IM_EPH_INT		0x20
-
-#define	RCR		4
-enum RxCfg { RxAllMulti = 0x0004, RxPromisc = 0x0002,
-	     RxEnable = 0x0100, RxStripCRC = 0x0200};
-#define  RCR_SOFTRESET	0x8000 	/* resets the chip */
-#define	 RCR_STRIP_CRC	0x200	/* strips CRC */
-#define  RCR_ENABLE	0x100	/* IFF this is set, we can receive packets */
-#define  RCR_ALMUL	0x4 	/* receive all multicast packets */
-#define	 RCR_PROMISC	0x2	/* enable promiscuous mode */
-
-/* the normal settings for the RCR register : */
-#define	 RCR_NORMAL	(RCR_STRIP_CRC | RCR_ENABLE)
-#define  RCR_CLEAR	0x0		/* set it to a base state */
-#define	COUNTER		6
-
-/* BANK 3 -- not the same values as in smc9194! */
-#define	MULTICAST0	0
-#define	MULTICAST2	2
-#define	MULTICAST4	4
-#define	MULTICAST6	6
-#define MGMT    	8
-#define REVISION	0x0a
-
-/* Transmit status bits. */
-#define TS_SUCCESS 0x0001
-#define TS_16COL   0x0010
-#define TS_LATCOL  0x0200
-#define TS_LOSTCAR 0x0400
-
-/* Receive status bits. */
-#define RS_ALGNERR	0x8000
-#define RS_BADCRC	0x2000
-#define RS_ODDFRAME	0x1000
-#define RS_TOOLONG	0x0800
-#define RS_TOOSHORT	0x0400
-#define RS_MULTICAST	0x0001
-#define RS_ERRORS	(RS_ALGNERR | RS_BADCRC | RS_TOOLONG | RS_TOOSHORT)
-
-#define set_bits(v, p) outw(inw(p)|(v), (p))
-#define mask_bits(v, p) outw(inw(p)&(v), (p))
-
-/*====================================================================*/
-
-static void smc91c92_detach(struct pcmcia_device *p_dev);
-static int smc91c92_config(struct pcmcia_device *link);
-static void smc91c92_release(struct pcmcia_device *link);
-
-static int smc_open(struct net_device *dev);
-static int smc_close(struct net_device *dev);
-static int smc_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static void smc_tx_timeout(struct net_device *dev);
-static netdev_tx_t smc_start_xmit(struct sk_buff *skb,
-					struct net_device *dev);
-static irqreturn_t smc_interrupt(int irq, void *dev_id);
-static void smc_rx(struct net_device *dev);
-static void set_rx_mode(struct net_device *dev);
-static int s9k_config(struct net_device *dev, struct ifmap *map);
-static void smc_set_xcvr(struct net_device *dev, int if_port);
-static void smc_reset(struct net_device *dev);
-static void media_check(u_long arg);
-static void mdio_sync(unsigned int addr);
-static int mdio_read(struct net_device *dev, int phy_id, int loc);
-static void mdio_write(struct net_device *dev, int phy_id, int loc, int value);
-static int smc_link_ok(struct net_device *dev);
-static const struct ethtool_ops ethtool_ops;
-
-static const struct net_device_ops smc_netdev_ops = {
-	.ndo_open		= smc_open,
-	.ndo_stop		= smc_close,
-	.ndo_start_xmit		= smc_start_xmit,
-	.ndo_tx_timeout 	= smc_tx_timeout,
-	.ndo_set_config 	= s9k_config,
-	.ndo_set_multicast_list = set_rx_mode,
-	.ndo_do_ioctl		= smc_ioctl,
-	.ndo_change_mtu		= eth_change_mtu,
-	.ndo_set_mac_address 	= eth_mac_addr,
-	.ndo_validate_addr	= eth_validate_addr,
-};
-
-static int smc91c92_probe(struct pcmcia_device *link)
-{
-    struct smc_private *smc;
-    struct net_device *dev;
-
-    dev_dbg(&link->dev, "smc91c92_attach()\n");
-
-    /* Create new ethernet device */
-    dev = alloc_etherdev(sizeof(struct smc_private));
-    if (!dev)
-	return -ENOMEM;
-    smc = netdev_priv(dev);
-    smc->p_dev = link;
-    link->priv = dev;
-
-    spin_lock_init(&smc->lock);
-
-    /* The SMC91c92-specific entries in the device structure. */
-    dev->netdev_ops = &smc_netdev_ops;
-    SET_ETHTOOL_OPS(dev, &ethtool_ops);
-    dev->watchdog_timeo = TX_TIMEOUT;
-
-    smc->mii_if.dev = dev;
-    smc->mii_if.mdio_read = mdio_read;
-    smc->mii_if.mdio_write = mdio_write;
-    smc->mii_if.phy_id_mask = 0x1f;
-    smc->mii_if.reg_num_mask = 0x1f;
-
-    return smc91c92_config(link);
-} /* smc91c92_attach */
-
-static void smc91c92_detach(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-
-    dev_dbg(&link->dev, "smc91c92_detach\n");
-
-    unregister_netdev(dev);
-
-    smc91c92_release(link);
-
-    free_netdev(dev);
-} /* smc91c92_detach */
-
-/*====================================================================*/
-
-static int cvt_ascii_address(struct net_device *dev, char *s)
-{
-    int i, j, da, c;
-
-    if (strlen(s) != 12)
-	return -1;
-    for (i = 0; i < 6; i++) {
-	da = 0;
-	for (j = 0; j < 2; j++) {
-	    c = *s++;
-	    da <<= 4;
-	    da += ((c >= '0') && (c <= '9')) ?
-		(c - '0') : ((c & 0x0f) + 9);
-	}
-	dev->dev_addr[i] = da;
-    }
-    return 0;
-}
-
-/*====================================================================
-
-    Configuration stuff for Megahertz cards
-
-    mhz_3288_power() is used to power up a 3288's ethernet chip.
-    mhz_mfc_config() handles socket setup for multifunction (1144
-    and 3288) cards.  mhz_setup() gets a card's hardware ethernet
-    address.
-
-======================================================================*/
-
-static int mhz_3288_power(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    struct smc_private *smc = netdev_priv(dev);
-    u_char tmp;
-
-    /* Read the ISR twice... */
-    readb(smc->base+MEGAHERTZ_ISR);
-    udelay(5);
-    readb(smc->base+MEGAHERTZ_ISR);
-
-    /* Pause 200ms... */
-    mdelay(200);
-
-    /* Now read and write the COR... */
-    tmp = readb(smc->base + link->config_base + CISREG_COR);
-    udelay(5);
-    writeb(tmp, smc->base + link->config_base + CISREG_COR);
-
-    return 0;
-}
-
-static int mhz_mfc_config_check(struct pcmcia_device *p_dev, void *priv_data)
-{
-	int k;
-	p_dev->io_lines = 16;
-	p_dev->resource[1]->start = p_dev->resource[0]->start;
-	p_dev->resource[1]->end = 8;
-	p_dev->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
-	p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
-	p_dev->resource[0]->end = 16;
-	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-	for (k = 0; k < 0x400; k += 0x10) {
-		if (k & 0x80)
-			continue;
-		p_dev->resource[0]->start = k ^ 0x300;
-		if (!pcmcia_request_io(p_dev))
-			return 0;
-	}
-	return -ENODEV;
-}
-
-static int mhz_mfc_config(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    struct smc_private *smc = netdev_priv(dev);
-    unsigned int offset;
-    int i;
-
-    link->config_flags |= CONF_ENABLE_SPKR | CONF_ENABLE_IRQ |
-	    CONF_AUTO_SET_IO;
-
-    /* The Megahertz combo cards have modem-like CIS entries, so
-       we have to explicitly try a bunch of port combinations. */
-    if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL))
-	    return -ENODEV;
-
-    dev->base_addr = link->resource[0]->start;
-
-    /* Allocate a memory window, for accessing the ISR */
-    link->resource[2]->flags = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
-    link->resource[2]->start = link->resource[2]->end = 0;
-    i = pcmcia_request_window(link, link->resource[2], 0);
-    if (i != 0)
-	    return -ENODEV;
-
-    smc->base = ioremap(link->resource[2]->start,
-		    resource_size(link->resource[2]));
-    offset = (smc->manfid == MANFID_MOTOROLA) ? link->config_base : 0;
-    i = pcmcia_map_mem_page(link, link->resource[2], offset);
-    if ((i == 0) &&
-	(smc->manfid == MANFID_MEGAHERTZ) &&
-	(smc->cardid == PRODID_MEGAHERTZ_EM3288))
-	    mhz_3288_power(link);
-
-    return 0;
-}
-
-static int pcmcia_get_versmac(struct pcmcia_device *p_dev,
-			      tuple_t *tuple,
-			      void *priv)
-{
-	struct net_device *dev = priv;
-	cisparse_t parse;
-	u8 *buf;
-
-	if (pcmcia_parse_tuple(tuple, &parse))
-		return -EINVAL;
-
-	buf = parse.version_1.str + parse.version_1.ofs[3];
-
-	if ((parse.version_1.ns > 3) && (cvt_ascii_address(dev, buf) == 0))
-		return 0;
-
-	return -EINVAL;
-};
-
-static int mhz_setup(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    size_t len;
-    u8 *buf;
-    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. */
-    /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (!pcmcia_loop_tuple(link, CISTPL_VERS_1, pcmcia_get_versmac, dev))
-	    return 0;
-
-    /* Another possibility: for the EM3288, in a special tuple */
-    rc = -1;
-    len = pcmcia_get_tuple(link, 0x81, &buf);
-    if (buf && len >= 13) {
-	    buf[12] = '\0';
-	    if (cvt_ascii_address(dev, buf) == 0)
-		    rc = 0;
-    }
-    kfree(buf);
-
-    return rc;
-};
-
-/*======================================================================
-
-    Configuration stuff for the Motorola Mariner
-
-    mot_config() writes directly to the Mariner configuration
-    registers because the CIS is just bogus.
-
-======================================================================*/
-
-static void mot_config(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    struct smc_private *smc = netdev_priv(dev);
-    unsigned int ioaddr = dev->base_addr;
-    unsigned int iouart = link->resource[1]->start;
-
-    /* Set UART base address and force map with COR bit 1 */
-    writeb(iouart & 0xff,        smc->base + MOT_UART + CISREG_IOBASE_0);
-    writeb((iouart >> 8) & 0xff, smc->base + MOT_UART + CISREG_IOBASE_1);
-    writeb(MOT_NORMAL,           smc->base + MOT_UART + CISREG_COR);
-
-    /* Set SMC base address and force map with COR bit 1 */
-    writeb(ioaddr & 0xff,        smc->base + MOT_LAN + CISREG_IOBASE_0);
-    writeb((ioaddr >> 8) & 0xff, smc->base + MOT_LAN + CISREG_IOBASE_1);
-    writeb(MOT_NORMAL,           smc->base + MOT_LAN + CISREG_COR);
-
-    /* Wait for things to settle down */
-    mdelay(100);
-}
-
-static int mot_setup(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    unsigned int ioaddr = dev->base_addr;
-    int i, wait, loop;
-    u_int addr;
-
-    /* Read Ethernet address from Serial EEPROM */
-
-    for (i = 0; i < 3; i++) {
-	SMC_SELECT_BANK(2);
-	outw(MOT_EEPROM + i, ioaddr + POINTER);
-	SMC_SELECT_BANK(1);
-	outw((CTL_RELOAD | CTL_EE_SELECT), ioaddr + CONTROL);
-
-	for (loop = wait = 0; loop < 200; loop++) {
-	    udelay(10);
-	    wait = ((CTL_RELOAD | CTL_STORE) & inw(ioaddr + CONTROL));
-	    if (wait == 0) break;
-	}
-	
-	if (wait)
-	    return -1;
-	
-	addr = inw(ioaddr + GENERAL);
-	dev->dev_addr[2*i]   = addr & 0xff;
-	dev->dev_addr[2*i+1] = (addr >> 8) & 0xff;
-    }
-
-    return 0;
-}
-
-/*====================================================================*/
-
-static int smc_configcheck(struct pcmcia_device *p_dev, void *priv_data)
-{
-	p_dev->resource[0]->end = 16;
-	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-
-	return pcmcia_request_io(p_dev);
-}
-
-static int smc_config(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    int i;
-
-    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
-
-    i = pcmcia_loop_config(link, smc_configcheck, NULL);
-    if (!i)
-	    dev->base_addr = link->resource[0]->start;
-
-    return i;
-}
-
-
-static int smc_setup(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-
-    /* Check for a LAN function extension tuple */
-    if (!pcmcia_get_mac_from_cis(link, dev))
-	    return 0;
-
-    /* Try the third string in the Version 1 Version/ID tuple. */
-    if (link->prod_id[2]) {
-	    if (cvt_ascii_address(dev, link->prod_id[2]) == 0)
-		    return 0;
-    }
-    return -1;
-}
-
-/*====================================================================*/
-
-static int osi_config(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    static const unsigned int com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
-    int i, j;
-
-    link->config_flags |= CONF_ENABLE_SPKR | CONF_ENABLE_IRQ;
-    link->resource[0]->end = 64;
-    link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
-    link->resource[1]->end = 8;
-
-    /* Enable Hard Decode, LAN, Modem */
-    link->io_lines = 16;
-    link->config_index = 0x23;
-
-    for (i = j = 0; j < 4; j++) {
-	link->resource[1]->start = com[j];
-	i = pcmcia_request_io(link);
-	if (i == 0)
-		break;
-    }
-    if (i != 0) {
-	/* Fallback: turn off hard decode */
-	link->config_index = 0x03;
-	link->resource[1]->end = 0;
-	i = pcmcia_request_io(link);
-    }
-    dev->base_addr = link->resource[0]->start + 0x10;
-    return i;
-}
-
-static int osi_load_firmware(struct pcmcia_device *link)
-{
-	const struct firmware *fw;
-	int i, err;
-
-	err = request_firmware(&fw, FIRMWARE_NAME, &link->dev);
-	if (err) {
-		pr_err("Failed to load firmware \"%s\"\n", FIRMWARE_NAME);
-		return err;
-	}
-
-	/* Download the Seven of Diamonds firmware */
-	for (i = 0; i < fw->size; i++) {
-	    outb(fw->data[i], link->resource[0]->start + 2);
-	    udelay(50);
-	}
-	release_firmware(fw);
-	return err;
-}
-
-static int pcmcia_osi_mac(struct pcmcia_device *p_dev,
-			  tuple_t *tuple,
-			  void *priv)
-{
-	struct net_device *dev = priv;
-	int i;
-
-	if (tuple->TupleDataLen < 8)
-		return -EINVAL;
-	if (tuple->TupleData[0] != 0x04)
-		return -EINVAL;
-	for (i = 0; i < 6; i++)
-		dev->dev_addr[i] = tuple->TupleData[i+2];
-	return 0;
-};
-
-
-static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)
-{
-    struct net_device *dev = link->priv;
-    int rc;
-
-    /* Read the station address from tuple 0x90, subtuple 0x04 */
-    if (pcmcia_loop_tuple(link, 0x90, pcmcia_osi_mac, dev))
-	    return -1;
-
-    if (((manfid == MANFID_OSITECH) &&
-	 (cardid == PRODID_OSITECH_SEVEN)) ||
-	((manfid == MANFID_PSION) &&
-	 (cardid == PRODID_PSION_NET100))) {
-	rc = osi_load_firmware(link);
-	if (rc)
-		return rc;
-    } else if (manfid == MANFID_OSITECH) {
-	/* Make sure both functions are powered up */
-	set_bits(0x300, link->resource[0]->start + OSITECH_AUI_PWR);
-	/* Now, turn on the interrupt for both card functions */
-	set_bits(0x300, link->resource[0]->start + OSITECH_RESET_ISR);
-	dev_dbg(&link->dev, "AUI/PWR: %4.4x RESET/ISR: %4.4x\n",
-	      inw(link->resource[0]->start + OSITECH_AUI_PWR),
-	      inw(link->resource[0]->start + OSITECH_RESET_ISR));
-    }
-    return 0;
-}
-
-static int smc91c92_suspend(struct pcmcia_device *link)
-{
-	struct net_device *dev = link->priv;
-
-	if (link->open)
-		netif_device_detach(dev);
-
-	return 0;
-}
-
-static int smc91c92_resume(struct pcmcia_device *link)
-{
-	struct net_device *dev = link->priv;
-	struct smc_private *smc = netdev_priv(dev);
-	int i;
-
-	if ((smc->manfid == MANFID_MEGAHERTZ) &&
-	    (smc->cardid == PRODID_MEGAHERTZ_EM3288))
-		mhz_3288_power(link);
-	if (smc->manfid == MANFID_MOTOROLA)
-		mot_config(link);
-	if ((smc->manfid == MANFID_OSITECH) &&
-	    (smc->cardid != PRODID_OSITECH_SEVEN)) {
-		/* Power up the card and enable interrupts */
-		set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
-		set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
-	}
-	if (((smc->manfid == MANFID_OSITECH) &&
-	     (smc->cardid == PRODID_OSITECH_SEVEN)) ||
-	    ((smc->manfid == MANFID_PSION) &&
-	     (smc->cardid == PRODID_PSION_NET100))) {
-		i = osi_load_firmware(link);
-		if (i) {
-			pr_err("smc91c92_cs: Failed to load firmware\n");
-			return i;
-		}
-	}
-	if (link->open) {
-		smc_reset(dev);
-		netif_device_attach(dev);
-	}
-
-	return 0;
-}
-
-
-/*======================================================================
-
-    This verifies that the chip is some SMC91cXX variant, and returns
-    the revision code if successful.  Otherwise, it returns -ENODEV.
-
-======================================================================*/
-
-static int check_sig(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    unsigned int ioaddr = dev->base_addr;
-    int width;
-    u_short s;
-
-    SMC_SELECT_BANK(1);
-    if (inw(ioaddr + BANK_SELECT) >> 8 != 0x33) {
-	/* Try powering up the chip */
-	outw(0, ioaddr + CONTROL);
-	mdelay(55);
-    }
-
-    /* Try setting bus width */
-    width = (link->resource[0]->flags == IO_DATA_PATH_WIDTH_AUTO);
-    s = inb(ioaddr + CONFIG);
-    if (width)
-	s |= CFG_16BIT;
-    else
-	s &= ~CFG_16BIT;
-    outb(s, ioaddr + CONFIG);
-
-    /* Check Base Address Register to make sure bus width is OK */
-    s = inw(ioaddr + BASE_ADDR);
-    if ((inw(ioaddr + BANK_SELECT) >> 8 == 0x33) &&
-	((s >> 8) != (s & 0xff))) {
-	SMC_SELECT_BANK(3);
-	s = inw(ioaddr + REVISION);
-	return s & 0xff;
-    }
-
-    if (width) {
-	    pr_info("using 8-bit IO window\n");
-
-	    smc91c92_suspend(link);
-	    pcmcia_fixup_iowidth(link);
-	    smc91c92_resume(link);
-	    return check_sig(link);
-    }
-    return -ENODEV;
-}
-
-static int smc91c92_config(struct pcmcia_device *link)
-{
-    struct net_device *dev = link->priv;
-    struct smc_private *smc = netdev_priv(dev);
-    char *name;
-    int i, rev, j = 0;
-    unsigned int ioaddr;
-    u_long mir;
-
-    dev_dbg(&link->dev, "smc91c92_config\n");
-
-    smc->manfid = link->manf_id;
-    smc->cardid = link->card_id;
-
-    if ((smc->manfid == MANFID_OSITECH) &&
-	(smc->cardid != PRODID_OSITECH_SEVEN)) {
-	i = osi_config(link);
-    } else if ((smc->manfid == MANFID_MOTOROLA) ||
-	       ((smc->manfid == MANFID_MEGAHERTZ) &&
-		((smc->cardid == PRODID_MEGAHERTZ_VARIOUS) ||
-		 (smc->cardid == PRODID_MEGAHERTZ_EM3288)))) {
-	i = mhz_mfc_config(link);
-    } else {
-	i = smc_config(link);
-    }
-    if (i)
-	    goto config_failed;
-
-    i = pcmcia_request_irq(link, smc_interrupt);
-    if (i)
-	    goto config_failed;
-    i = pcmcia_enable_device(link);
-    if (i)
-	    goto config_failed;
-
-    if (smc->manfid == MANFID_MOTOROLA)
-	mot_config(link);
-
-    dev->irq = link->irq;
-
-    if ((if_port >= 0) && (if_port <= 2))
-	dev->if_port = if_port;
-    else
-	dev_notice(&link->dev, "invalid if_port requested\n");
-
-    switch (smc->manfid) {
-    case MANFID_OSITECH:
-    case MANFID_PSION:
-	i = osi_setup(link, smc->manfid, smc->cardid); break;
-    case MANFID_SMC:
-    case MANFID_NEW_MEDIA:
-	i = smc_setup(link); break;
-    case 0x128: /* For broken Megahertz cards */
-    case MANFID_MEGAHERTZ:
-	i = mhz_setup(link); break;
-    case MANFID_MOTOROLA:
-    default: /* get the hw address from EEPROM */
-	i = mot_setup(link); break;
-    }
-
-    if (i != 0) {
-	dev_notice(&link->dev, "Unable to find hardware address.\n");
-	goto config_failed;
-    }
-
-    smc->duplex = 0;
-    smc->rx_ovrn = 0;
-
-    rev = check_sig(link);
-    name = "???";
-    if (rev > 0)
-	switch (rev >> 4) {
-	case 3: name = "92"; break;
-	case 4: name = ((rev & 15) >= 6) ? "96" : "94"; break;
-	case 5: name = "95"; break;
-	case 7: name = "100"; break;
-	case 8: name = "100-FD"; break;
-	case 9: name = "110"; break;
-	}
-
-    ioaddr = dev->base_addr;
-    if (rev > 0) {
-	u_long mcr;
-	SMC_SELECT_BANK(0);
-	mir = inw(ioaddr + MEMINFO) & 0xff;
-	if (mir == 0xff) mir++;
-	/* Get scale factor for memory size */
-	mcr = ((rev >> 4) > 3) ? inw(ioaddr + MEMCFG) : 0x0200;
-	mir *= 128 * (1<<((mcr >> 9) & 7));
-	SMC_SELECT_BANK(1);
-	smc->cfg = inw(ioaddr + CONFIG) & ~CFG_AUI_SELECT;
-	smc->cfg |= CFG_NO_WAIT | CFG_16BIT | CFG_STATIC;
-	if (smc->manfid == MANFID_OSITECH)
-	    smc->cfg |= CFG_IRQ_SEL_1 | CFG_IRQ_SEL_0;
-	if ((rev >> 4) >= 7)
-	    smc->cfg |= CFG_MII_SELECT;
-    } else
-	mir = 0;
-
-    if (smc->cfg & CFG_MII_SELECT) {
-	SMC_SELECT_BANK(3);
-
-	for (i = 0; i < 32; i++) {
-	    j = mdio_read(dev, i, 1);
-	    if ((j != 0) && (j != 0xffff)) break;
-	}
-	smc->mii_if.phy_id = (i < 32) ? i : -1;
-
-	SMC_SELECT_BANK(0);
-    }
-
-    SET_NETDEV_DEV(dev, &link->dev);
-
-    if (register_netdev(dev) != 0) {
-	dev_err(&link->dev, "register_netdev() failed\n");
-	goto config_undo;
-    }
-
-    netdev_info(dev, "smc91c%s rev %d: io %#3lx, irq %d, hw_addr %pM\n",
-		name, (rev & 0x0f), dev->base_addr, dev->irq, dev->dev_addr);
-
-    if (rev > 0) {
-	if (mir & 0x3ff)
-	    netdev_info(dev, "  %lu byte", mir);
-	else
-	    netdev_info(dev, "  %lu kb", mir>>10);
-	pr_cont(" buffer, %s xcvr\n",
-		(smc->cfg & CFG_MII_SELECT) ? "MII" : if_names[dev->if_port]);
-    }
-
-    if (smc->cfg & CFG_MII_SELECT) {
-	if (smc->mii_if.phy_id != -1) {
-	    netdev_dbg(dev, "  MII transceiver at index %d, status %x\n",
-		       smc->mii_if.phy_id, j);
-	} else {
-	    netdev_notice(dev, "  No MII transceivers found!\n");
-	}
-    }
-    return 0;
-
-config_undo:
-    unregister_netdev(dev);
-config_failed:
-    smc91c92_release(link);
-    free_netdev(dev);
-    return -ENODEV;
-} /* smc91c92_config */
-
-static void smc91c92_release(struct pcmcia_device *link)
-{
-	dev_dbg(&link->dev, "smc91c92_release\n");
-	if (link->resource[2]->end) {
-		struct net_device *dev = link->priv;
-		struct smc_private *smc = netdev_priv(dev);
-		iounmap(smc->base);
-	}
-	pcmcia_disable_device(link);
-}
-
-/*======================================================================
-
-    MII interface support for SMC91cXX based cards
-======================================================================*/
-
-#define MDIO_SHIFT_CLK		0x04
-#define MDIO_DATA_OUT		0x01
-#define MDIO_DIR_WRITE		0x08
-#define MDIO_DATA_WRITE0	(MDIO_DIR_WRITE)
-#define MDIO_DATA_WRITE1	(MDIO_DIR_WRITE | MDIO_DATA_OUT)
-#define MDIO_DATA_READ		0x02
-
-static void mdio_sync(unsigned int addr)
-{
-    int bits;
-    for (bits = 0; bits < 32; bits++) {
-	outb(MDIO_DATA_WRITE1, addr);
-	outb(MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, addr);
-    }
-}
-
-static int mdio_read(struct net_device *dev, int phy_id, int loc)
-{
-    unsigned int addr = dev->base_addr + MGMT;
-    u_int cmd = (0x06<<10)|(phy_id<<5)|loc;
-    int i, retval = 0;
-
-    mdio_sync(addr);
-    for (i = 13; i >= 0; i--) {
-	int dat = (cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-	outb(dat, addr);
-	outb(dat | MDIO_SHIFT_CLK, addr);
-    }
-    for (i = 19; i > 0; i--) {
-	outb(0, addr);
-	retval = (retval << 1) | ((inb(addr) & MDIO_DATA_READ) != 0);
-	outb(MDIO_SHIFT_CLK, addr);
-    }
-    return (retval>>1) & 0xffff;
-}
-
-static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
-{
-    unsigned int addr = dev->base_addr + MGMT;
-    u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
-    int i;
-
-    mdio_sync(addr);
-    for (i = 31; i >= 0; i--) {
-	int dat = (cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-	outb(dat, addr);
-	outb(dat | MDIO_SHIFT_CLK, addr);
-    }
-    for (i = 1; i >= 0; i--) {
-	outb(0, addr);
-	outb(MDIO_SHIFT_CLK, addr);
-    }
-}
-
-/*======================================================================
-
-    The driver core code, most of which should be common with a
-    non-PCMCIA implementation.
-
-======================================================================*/
-
-#ifdef PCMCIA_DEBUG
-static void smc_dump(struct net_device *dev)
-{
-    unsigned int ioaddr = dev->base_addr;
-    u_short i, w, save;
-    save = inw(ioaddr + BANK_SELECT);
-    for (w = 0; w < 4; w++) {
-	SMC_SELECT_BANK(w);
-	netdev_printk(KERN_DEBUG, dev, "bank %d: ", w);
-	for (i = 0; i < 14; i += 2)
-	    pr_cont(" %04x", inw(ioaddr + i));
-	pr_cont("\n");
-    }
-    outw(save, ioaddr + BANK_SELECT);
-}
-#endif
-
-static int smc_open(struct net_device *dev)
-{
-    struct smc_private *smc = netdev_priv(dev);
-    struct pcmcia_device *link = smc->p_dev;
-
-    dev_dbg(&link->dev, "%s: smc_open(%p), ID/Window %4.4x.\n",
-	  dev->name, dev, inw(dev->base_addr + BANK_SELECT));
-#ifdef PCMCIA_DEBUG