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
/
smc-ultra32.c
diff --git
a/drivers/net/smc-ultra32.c
b/drivers/net/smc-ultra32.c
index
b26e0f8
..
2c5319c
100644
(file)
--- a/
drivers/net/smc-ultra32.c
+++ b/
drivers/net/smc-ultra32.c
@@
-61,6
+61,8
@@
static const char *version = "smc-ultra32.c: 06/97 v1.00\n";
#include "8390.h"
#include "8390.h"
+#define DRV_NAME "smc-ultra32"
+
static int ultra32_probe1(struct net_device *dev, int ioaddr);
static int ultra32_open(struct net_device *dev);
static void ultra32_reset_8390(struct net_device *dev);
static int ultra32_probe1(struct net_device *dev, int ioaddr);
static int ultra32_open(struct net_device *dev);
static void ultra32_reset_8390(struct net_device *dev);
@@
-72,7
+74,7
@@
static void ultra32_block_output(struct net_device *dev, int count,
const unsigned char *buf,
const int start_page);
static int ultra32_close(struct net_device *dev);
const unsigned char *buf,
const int start_page);
static int ultra32_close(struct net_device *dev);
-
\f
+
#define ULTRA32_CMDREG 0 /* Offset to ASIC command register. */
#define ULTRA32_RESET 0x80 /* Board reset, in ULTRA32_CMDREG. */
#define ULTRA32_MEMENB 0x40 /* Enable the shared memory. */
#define ULTRA32_CMDREG 0 /* Offset to ASIC command register. */
#define ULTRA32_RESET 0x80 /* Board reset, in ULTRA32_CMDREG. */
#define ULTRA32_MEMENB 0x40 /* Enable the shared memory. */
@@
-102,6
+104,7
@@
static void cleanup_card(struct net_device *dev)
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
/* NB: ultra32_close_card() does free_irq */
release_region(ioaddr, ULTRA32_IO_EXTENT);
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
/* NB: ultra32_close_card() does free_irq */
release_region(ioaddr, ULTRA32_IO_EXTENT);
+ iounmap(ei_status.mem);
}
/* Probe for the Ultra32. This looks like a 8013 with the station
}
/* Probe for the Ultra32. This looks like a 8013 with the station
@@
-163,7
+166,7
@@
static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
unsigned char reg4;
const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
unsigned char reg4;
const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
- if (!request_region(ioaddr, ULTRA32_IO_EXTENT,
dev->name
))
+ if (!request_region(ioaddr, ULTRA32_IO_EXTENT,
DRV_NAME
))
return -EBUSY;
if (inb(ioaddr + ULTRA32_IDPORT) == 0xff ||
return -EBUSY;
if (inb(ioaddr + ULTRA32_IDPORT) == 0xff ||
@@
-257,8
+260,13
@@
static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
/* All Ultra32 cards have 32KB memory with an 8KB window. */
ei_status.stop_page = 128;
/* All Ultra32 cards have 32KB memory with an 8KB window. */
ei_status.stop_page = 128;
- ei_status.rmem_start = dev->mem_start + TX_PAGES*256;
- dev->mem_end = ei_status.rmem_end = dev->mem_start + 0x1fff;
+ ei_status.mem = ioremap(dev->mem_start, 0x2000);
+ if (!ei_status.mem) {
+ printk(", failed to ioremap.\n");
+ retval = -ENOMEM;
+ goto out;
+ }
+ dev->mem_end = dev->mem_start + 0x1fff;
printk(", IRQ %d, 32KB memory, 8KB window at 0x%lx-0x%lx.\n",
dev->irq, dev->mem_start, dev->mem_end);
printk(", IRQ %d, 32KB memory, 8KB window at 0x%lx-0x%lx.\n",
dev->irq, dev->mem_start, dev->mem_end);
@@
-282,7
+290,7
@@
out:
static int ultra32_open(struct net_device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
static int ultra32_open(struct net_device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
- int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 :
SA_SHIRQ
;
+ int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 :
IRQF_SHARED
;
int retval;
retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
int retval;
retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
@@
-306,7
+314,7
@@
static int ultra32_close(struct net_device *dev)
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* CMDREG */
netif_stop_queue(dev);
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* CMDREG */
netif_stop_queue(dev);
-
+
if (ei_debug > 1)
printk("%s: Shutting down ethercard.\n", dev->name);
if (ei_debug > 1)
printk("%s: Shutting down ethercard.\n", dev->name);
@@
-343,7
+351,7
@@
static void ultra32_get_8390_hdr(struct net_device *dev,
struct e8390_pkt_hdr *hdr,
int ring_page)
{
struct e8390_pkt_hdr *hdr,
int ring_page)
{
-
unsigned long hdr_start = dev->mem_start
+ ((ring_page & 0x1f) << 8);
+
void __iomem *hdr_start = ei_status.mem
+ ((ring_page & 0x1f) << 8);
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
/* Select correct 8KB Window. */
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
/* Select correct 8KB Window. */
@@
-352,10
+360,10
@@
static void ultra32_get_8390_hdr(struct net_device *dev,
#ifdef __BIG_ENDIAN
/* Officially this is what we are doing, but the readl() is faster */
/* unfortunately it isn't endian aware of the struct */
#ifdef __BIG_ENDIAN
/* Officially this is what we are doing, but the readl() is faster */
/* unfortunately it isn't endian aware of the struct */
-
isa_
memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
+ memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
hdr->count = le16_to_cpu(hdr->count);
#else
hdr->count = le16_to_cpu(hdr->count);
#else
- ((unsigned int*)hdr)[0] =
isa_
readl(hdr_start);
+ ((unsigned int*)hdr)[0] = readl(hdr_start);
#endif
}
#endif
}
@@
-369,26
+377,26
@@
static void ultra32_block_input(struct net_device *dev,
struct sk_buff *skb,
int ring_offset)
{
struct sk_buff *skb,
int ring_offset)
{
-
unsigned long xfer_start = dev->mem_start
+ (ring_offset & 0x1fff);
+
void __iomem *xfer_start = ei_status.mem
+ (ring_offset & 0x1fff);
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
if ((ring_offset & ~0x1fff) != ((ring_offset + count - 1) & ~0x1fff)) {
int semi_count = 8192 - (ring_offset & 0x1FFF);
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
if ((ring_offset & ~0x1fff) != ((ring_offset + count - 1) & ~0x1fff)) {
int semi_count = 8192 - (ring_offset & 0x1FFF);
-
isa_
memcpy_fromio(skb->data, xfer_start, semi_count);
+ memcpy_fromio(skb->data, xfer_start, semi_count);
count -= semi_count;
if (ring_offset < 96*256) {
/* Select next 8KB Window. */
ring_offset += semi_count;
outb(ei_status.reg0 | ((ring_offset & 0x6000) >> 13), RamReg);
count -= semi_count;
if (ring_offset < 96*256) {
/* Select next 8KB Window. */
ring_offset += semi_count;
outb(ei_status.reg0 | ((ring_offset & 0x6000) >> 13), RamReg);
-
isa_memcpy_fromio(skb->data + semi_count, dev->mem_start
, count);
+
memcpy_fromio(skb->data + semi_count, ei_status.mem
, count);
} else {
/* Select first 8KB Window. */
outb(ei_status.reg0, RamReg);
} else {
/* Select first 8KB Window. */
outb(ei_status.reg0, RamReg);
-
isa_memcpy_fromio(skb->data + semi_count, ei_status.rmem_start
, count);
+
memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256
, count);
}
} else {
/* Packet is in one chunk -- we can copy + cksum. */
}
} else {
/* Packet is in one chunk -- we can copy + cksum. */
-
isa_
eth_io_copy_and_sum(skb, xfer_start, count, 0);
+ eth_io_copy_and_sum(skb, xfer_start, count, 0);
}
}
}
}
@@
-397,15
+405,15
@@
static void ultra32_block_output(struct net_device *dev,
const unsigned char *buf,
int start_page)
{
const unsigned char *buf,
int start_page)
{
-
unsigned long xfer_start = dev->mem_start
+ (start_page<<8);
+
void __iomem *xfer_start = ei_status.mem
+ (start_page<<8);
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
/* Select first 8KB Window. */
outb(ei_status.reg0, RamReg);
unsigned int RamReg = dev->base_addr - ULTRA32_NIC_OFFSET + ULTRA32_CFG3;
/* Select first 8KB Window. */
outb(ei_status.reg0, RamReg);
-
isa_
memcpy_toio(xfer_start, buf, count);
+ memcpy_toio(xfer_start, buf, count);
}
}
-
\f
+
#ifdef MODULE
#define MAX_ULTRA32_CARDS 4 /* Max number of Ultra cards per module */
static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
#ifdef MODULE
#define MAX_ULTRA32_CARDS 4 /* Max number of Ultra cards per module */
static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
@@
-413,7
+421,7
@@
static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
MODULE_LICENSE("GPL");
-int init_module(void)
+int
__init
init_module(void)
{
int this_dev, found = 0;
{
int this_dev, found = 0;
@@
-429,7
+437,7
@@
int init_module(void)
return -ENXIO;
}
return -ENXIO;
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
int this_dev;
{
int this_dev;