git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
zorro8390.c
diff --git
a/drivers/net/zorro8390.c
b/drivers/net/zorro8390.c
index
d721fc6
..
d85e2ea
100644
(file)
--- a/
drivers/net/zorro8390.c
+++ b/
drivers/net/zorro8390.c
@@
-27,14
+27,25
@@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/zorro.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/zorro.h>
+#include <linux/jiffies.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/amigaints.h>
#include <asm/amigahw.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/amigaints.h>
#include <asm/amigahw.h>
-#include "8390.h"
+#define EI_SHIFT(x) (ei_local->reg_offset[x])
+#define ei_inb(port) in_8(port)
+#define ei_outb(val,port) out_8(port,val)
+#define ei_inb_p(port) in_8(port)
+#define ei_outb_p(val,port) out_8(port,val)
+static const char version[] =
+ "8390.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
+
+#include "lib8390.c"
+
+#define DRV_NAME "zorro8390"
#define NE_BASE (dev->base_addr)
#define NE_CMD (0x00*2)
#define NE_BASE (dev->base_addr)
#define NE_CMD (0x00*2)
@@
-111,11
+122,11
@@
static int __devinit zorro8390_init_one(struct zorro_dev *z,
break;
board = z->resource.start;
ioaddr = board+cards[i].offset;
break;
board = z->resource.start;
ioaddr = board+cards[i].offset;
- dev =
alloc_ei_netdev(
);
+ dev =
____alloc_ei_netdev(0
);
if (!dev)
return -ENOMEM;
SET_MODULE_OWNER(dev);
if (!dev)
return -ENOMEM;
SET_MODULE_OWNER(dev);
- if (!request_mem_region(ioaddr, NE_IO_EXTENT*2,
dev->name
)) {
+ if (!request_mem_region(ioaddr, NE_IO_EXTENT*2,
DRV_NAME
)) {
free_netdev(dev);
return -EBUSY;
}
free_netdev(dev);
return -EBUSY;
}
@@
-149,7
+160,7
@@
static int __devinit zorro8390_init(struct net_device *dev,
z_writeb(z_readb(ioaddr + NE_RESET), ioaddr + NE_RESET);
while ((z_readb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
z_writeb(z_readb(ioaddr + NE_RESET), ioaddr + NE_RESET);
while ((z_readb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
- if (
jiffies - reset_start_time > 2*HZ/100
) {
+ if (
time_after(jiffies, reset_start_time + 2*HZ/100)
) {
printk(KERN_WARNING " not found (no reset ack).\n");
return -ENODEV;
}
printk(KERN_WARNING " not found (no reset ack).\n");
return -ENODEV;
}
@@
-198,7
+209,7
@@
static int __devinit zorro8390_init(struct net_device *dev,
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
- i = request_irq(IRQ_AMIGA_PORTS,
ei_interrupt, SA_SHIRQ, dev->name
, dev);
+ i = request_irq(IRQ_AMIGA_PORTS,
__ei_interrupt, IRQF_SHARED, DRV_NAME
, dev);
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
@@
-223,10
+234,10
@@
static int __devinit zorro8390_init(struct net_device *dev,
dev->open = &zorro8390_open;
dev->stop = &zorro8390_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->open = &zorro8390_open;
dev->stop = &zorro8390_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = ei_poll;
+ dev->poll_controller =
__
ei_poll;
#endif
#endif
- NS8390_init(dev, 0);
+
__
NS8390_init(dev, 0);
err = register_netdev(dev);
if (err) {
free_irq(IRQ_AMIGA_PORTS, dev);
err = register_netdev(dev);
if (err) {
free_irq(IRQ_AMIGA_PORTS, dev);
@@
-243,7
+254,7
@@
static int __devinit zorro8390_init(struct net_device *dev,
static int zorro8390_open(struct net_device *dev)
{
static int zorro8390_open(struct net_device *dev)
{
- ei_open(dev);
+
__
ei_open(dev);
return 0;
}
return 0;
}
@@
-251,7
+262,7
@@
static int zorro8390_close(struct net_device *dev)
{
if (ei_debug > 1)
printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
{
if (ei_debug > 1)
printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
- ei_close(dev);
+
__
ei_close(dev);
return 0;
}
return 0;
}
@@
-271,7
+282,7
@@
static void zorro8390_reset_8390(struct net_device *dev)
/* This check _should_not_ be necessary, omit eventually. */
while ((z_readb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
/* This check _should_not_ be necessary, omit eventually. */
while ((z_readb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
- if (
jiffies - reset_start_time > 2*HZ/100
) {
+ if (
time_after(jiffies, reset_start_time + 2*HZ/100)
) {
printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
@@
-398,11
+409,11
@@
static void zorro8390_block_output(struct net_device *dev, int count,
dma_start = jiffies;
while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
dma_start = jiffies;
while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
- if (
jiffies - dma_start > 2*HZ/100) {
/* 20ms */
+ if (
time_after(jiffies, dma_start + 2*HZ/100)) {
/* 20ms */
printk(KERN_ERR "%s: timeout waiting for Tx RDC.\n",
dev->name);
zorro8390_reset_8390(dev);
printk(KERN_ERR "%s: timeout waiting for Tx RDC.\n",
dev->name);
zorro8390_reset_8390(dev);
- NS8390_init(dev,1);
+
__
NS8390_init(dev,1);
break;
}
break;
}
@@
-423,7
+434,7
@@
static void __devexit zorro8390_remove_one(struct zorro_dev *z)
static int __init zorro8390_init_module(void)
{
static int __init zorro8390_init_module(void)
{
- return zorro_
module_init
(&zorro8390_driver);
+ return zorro_
register_driver
(&zorro8390_driver);
}
static void __exit zorro8390_cleanup_module(void)
}
static void __exit zorro8390_cleanup_module(void)