#ifdef DEBUG
static void dumpmem(struct net_device *dev, u32 start, u32 len)
{
+ skmca_priv *priv = netdev_priv(dev);
int z;
for (z = 0; z < len; z++) {
if ((z & 15) == 0)
printk("%04x:", z);
- printk(" %02x", SKMCA_READB(dev->mem_start + start + z));
+ printk(" %02x", readb(priv->base + start + z));
if ((z & 15) == 15)
printk("\n");
}
static void ResetBoard(struct net_device *dev)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
- SKMCA_WRITEB(CTRL_RESET_ON, priv->ctrladdr);
+ writeb(CTRL_RESET_ON, priv->ctrladdr);
udelay(10);
- SKMCA_WRITEB(CTRL_RESET_OFF, priv->ctrladdr);
+ writeb(CTRL_RESET_OFF, priv->ctrladdr);
}
/* wait for LANCE interface to become not busy */
static int WaitLANCE(struct net_device *dev)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
int t = 0;
- while ((SKMCA_READB(priv->ctrladdr) & STAT_IO_BUSY) ==
+ while ((readb(priv->ctrladdr) & STAT_IO_BUSY) ==
STAT_IO_BUSY) {
udelay(1);
if (++t > 1000) {
static void SetLANCE(struct net_device *dev, u16 addr, u16 value)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
unsigned long flags;
/* disable interrupts */
/* transfer register address to RAP */
- SKMCA_WRITEB(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_RAP,
- priv->ctrladdr);
- SKMCA_WRITEW(addr, priv->ioregaddr);
- SKMCA_WRITEB(IOCMD_GO, priv->cmdaddr);
+ writeb(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_RAP, priv->ctrladdr);
+ writew(addr, priv->ioregaddr);
+ writeb(IOCMD_GO, priv->cmdaddr);
udelay(1);
WaitLANCE(dev);
/* transfer data to register */
- SKMCA_WRITEB(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_DATA,
- priv->ctrladdr);
- SKMCA_WRITEW(value, priv->ioregaddr);
- SKMCA_WRITEB(IOCMD_GO, priv->cmdaddr);
+ writeb(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_DATA, priv->ctrladdr);
+ writew(value, priv->ioregaddr);
+ writeb(IOCMD_GO, priv->cmdaddr);
udelay(1);
WaitLANCE(dev);
static u16 GetLANCE(struct net_device *dev, u16 addr)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
unsigned long flags;
unsigned int res;
/* transfer register address to RAP */
- SKMCA_WRITEB(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_RAP,
- priv->ctrladdr);
- SKMCA_WRITEW(addr, priv->ioregaddr);
- SKMCA_WRITEB(IOCMD_GO, priv->cmdaddr);
+ writeb(CTRL_RESET_OFF | CTRL_RW_WRITE | CTRL_ADR_RAP, priv->ctrladdr);
+ writew(addr, priv->ioregaddr);
+ writeb(IOCMD_GO, priv->cmdaddr);
udelay(1);
WaitLANCE(dev);
/* transfer data from register */
- SKMCA_WRITEB(CTRL_RESET_OFF | CTRL_RW_READ | CTRL_ADR_DATA,
- priv->ctrladdr);
- SKMCA_WRITEB(IOCMD_GO, priv->cmdaddr);
+ writeb(CTRL_RESET_OFF | CTRL_RW_READ | CTRL_ADR_DATA, priv->ctrladdr);
+ writeb(IOCMD_GO, priv->cmdaddr);
udelay(1);
WaitLANCE(dev);
- res = SKMCA_READW(priv->ioregaddr);
+ res = readw(priv->ioregaddr);
/* reenable interrupts */
static void InitDscrs(struct net_device *dev)
{
+ skmca_priv *priv = netdev_priv(dev);
u32 bufaddr;
/* Set up Tx descriptors. The board has only 16K RAM so bits 16..23
descr.Flags = 0;
descr.Len = 0xf000;
descr.Status = 0;
- SKMCA_TOIO(dev->mem_start + RAM_TXBASE +
+ memcpy_toio(priv->base + RAM_TXBASE +
(z * sizeof(LANCE_TxDescr)), &descr,
sizeof(LANCE_TxDescr));
- SKMCA_SETIO(dev->mem_start + bufaddr, 0,
- RAM_BUFSIZE);
+ memset_io(priv->base + bufaddr, 0, RAM_BUFSIZE);
bufaddr += RAM_BUFSIZE;
}
}
descr.Flags = RXDSCR_FLAGS_OWN;
descr.MaxLen = -RAM_BUFSIZE;
descr.Len = 0;
- SKMCA_TOIO(dev->mem_start + RAM_RXBASE +
+ memcpy_toio(priv->base + RAM_RXBASE +
(z * sizeof(LANCE_RxDescr)), &descr,
sizeof(LANCE_RxDescr));
- SKMCA_SETIO(dev->mem_start + bufaddr, 0,
- RAM_BUFSIZE);
+ memset_io(priv->base + bufaddr, 0, RAM_BUFSIZE);
bufaddr += RAM_BUFSIZE;
}
}
static void InitLANCE(struct net_device *dev)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
/* build up descriptors. */
static void InitBoard(struct net_device *dev)
{
+ skmca_priv *priv = netdev_priv(dev);
LANCE_InitBlock block;
/* Lay out the shared RAM - first we create the init block for the LANCE.
block.RdrP = (RAM_RXBASE & 0xffffff) | (LRXCOUNT << 29);
block.TdrP = (RAM_TXBASE & 0xffffff) | (LTXCOUNT << 29);
- SKMCA_TOIO(dev->mem_start + RAM_INITBASE, &block, sizeof(block));
+ memcpy_toio(priv->base + RAM_INITBASE, &block, sizeof(block));
/* initialize LANCE. Implicitly sets up other structures in RAM. */
static u16 irqmiss_handler(struct net_device *dev, u16 oldcsr0)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
/* update statistics */
static u16 irqrx_handler(struct net_device *dev, u16 oldcsr0)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
LANCE_RxDescr descr;
unsigned int descraddr;
descraddr = RAM_RXBASE + (priv->nextrx * sizeof(LANCE_RxDescr));
while (1) {
/* read descriptor */
- SKMCA_FROMIO(&descr, dev->mem_start + descraddr,
+ memcpy_fromio(&descr, priv->base + descraddr,
sizeof(LANCE_RxDescr));
/* if we reach a descriptor we do not own, we're done */
if (skb == NULL)
priv->stat.rx_dropped++;
else {
- SKMCA_FROMIO(skb_put(skb, descr.Len),
- dev->mem_start +
+ memcpy_fromio(skb_put(skb, descr.Len),
+ priv->base +
descr.LowAddr, descr.Len);
skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
descr.Flags |= RXDSCR_FLAGS_OWN;
/* update descriptor in shared RAM */
- SKMCA_TOIO(dev->mem_start + descraddr, &descr,
+ memcpy_toio(priv->base + descraddr, &descr,
sizeof(LANCE_RxDescr));
/* go to next descriptor */
static u16 irqtx_handler(struct net_device *dev, u16 oldcsr0)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
LANCE_TxDescr descr;
unsigned int descraddr;
RAM_TXBASE + (priv->nexttxdone * sizeof(LANCE_TxDescr));
while (priv->txbusy > 0) {
/* read descriptor */
- SKMCA_FROMIO(&descr, dev->mem_start + descraddr,
+ memcpy_fromio(&descr, priv->base + descraddr,
sizeof(LANCE_TxDescr));
/* if the LANCE still owns this one, we've worked out all sent packets */
if (dev == NULL)
return len;
- if (dev->priv == NULL)
- return len;
- priv = (skmca_priv *) dev->priv;
+ priv = netdev_priv(dev);
/* print info */
static int skmca_open(struct net_device *dev)
{
int result;
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
/* register resources - only necessary for IRQ */
result =
static int skmca_tx(struct sk_buff *skb, struct net_device *dev)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
LANCE_TxDescr descr;
unsigned int address;
int tmplen, retval = 0;
/* get TX descriptor */
address = RAM_TXBASE + (priv->nexttxput * sizeof(LANCE_TxDescr));
- SKMCA_FROMIO(&descr, dev->mem_start + address,
- sizeof(LANCE_TxDescr));
+ memcpy_fromio(&descr, priv->base + address, sizeof(LANCE_TxDescr));
/* enter packet length as 2s complement - assure minimum length */
tmplen = skb->len;
unsigned int destoffs = 0, l = strlen(fill);
while (destoffs < tmplen) {
- SKMCA_TOIO(dev->mem_start + descr.LowAddr +
+ memcpy_toio(priv->base + descr.LowAddr +
destoffs, fill, l);
destoffs += l;
}
}
/* do the real data copying */
- SKMCA_TOIO(dev->mem_start + descr.LowAddr, skb->data, skb->len);
+ memcpy_toio(priv->base + descr.LowAddr, skb->data, skb->len);
/* hand descriptor over to LANCE - this is the first and last chunk */
descr.Flags =
netif_stop_queue(dev);
/* write descriptor back to RAM */
- SKMCA_TOIO(dev->mem_start + address, &descr,
- sizeof(LANCE_TxDescr));
+ memcpy_toio(priv->base + address, &descr, sizeof(LANCE_TxDescr));
/* if no descriptors were active, give the LANCE a hint to read it
immediately */
static struct net_device_stats *skmca_stats(struct net_device *dev)
{
- skmca_priv *priv = (skmca_priv *) dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
return &(priv->stat);
}
static void skmca_set_multicast_list(struct net_device *dev)
{
+ skmca_priv *priv = netdev_priv(dev);
LANCE_InitBlock block;
/* first stop the LANCE... */
StopLANCE(dev);
/* ...then modify the initialization block... */
- SKMCA_FROMIO(&block, dev->mem_start + RAM_INITBASE, sizeof(block));
+ memcpy_fromio(&block, priv->base + RAM_INITBASE, sizeof(block));
if (dev->flags & IFF_PROMISC)
block.Mode |= LANCE_INIT_PROM;
else
}
}
- SKMCA_TOIO(dev->mem_start + RAM_INITBASE, &block, sizeof(block));
+ memcpy_toio(priv->base + RAM_INITBASE, &block, sizeof(block));
/* ...then reinit LANCE with the correct flags */
InitLANCE(dev);
static void cleanup_card(struct net_device *dev)
{
- skmca_priv *priv = dev->priv;
+ skmca_priv *priv = netdev_priv(dev);
DeinitBoard(dev);
if (dev->irq != 0)
free_irq(dev->irq, dev);
+ iounmap(priv->base);
mca_mark_as_unused(priv->slot);
mca_set_adapter_procfn(priv->slot, NULL, NULL);
}
printk("%s: SKNet %s adapter found in slot %d\n", dev->name,
junior ? "Junior MC2" : "MC2+", slot + 1);
- /* allocate structure */
- priv = dev->priv;
+ priv = netdev_priv(dev);
+ priv->base = ioremap(base, 0x4000);
+ if (!priv->base) {
+ mca_set_adapter_procfn(slot, NULL, NULL);
+ mca_mark_as_unused(slot);
+ free_netdev(dev);
+ return ERR_PTR(-ENOMEM);
+ }
+
priv->slot = slot;
- priv->macbase = base + 0x3fc0;
- priv->ioregaddr = base + 0x3ff0;
- priv->ctrladdr = base + 0x3ff2;
- priv->cmdaddr = base + 0x3ff3;
+ priv->macbase = priv->base + 0x3fc0;
+ priv->ioregaddr = priv->base + 0x3ff0;
+ priv->ctrladdr = priv->base + 0x3ff2;
+ priv->cmdaddr = priv->base + 0x3ff3;
priv->medium = medium;
memset(&priv->stat, 0, sizeof(struct net_device_stats));
spin_lock_init(&priv->lock);
/* copy out MAC address */
for (i = 0; i < 6; i++)
- dev->dev_addr[i] = SKMCA_READB(priv->macbase + (i << 1));
+ dev->dev_addr[i] = readb(priv->macbase + (i << 1));
/* print config */
printk("%s: IRQ %d, memory %#lx-%#lx, "
git://git.onelab.eu / linux-2.6.git / blobdiff