patch-2.4.21 linux-2.4.21/drivers/net/e2100.c
Next file: linux-2.4.21/drivers/net/eepro.c
Previous file: linux-2.4.21/drivers/net/e1000/e1000_proc.c
Back to the patch index
Back to the overall index
- Lines: 67
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/e2100.c
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/net/e2100.c linux-2.4.21/drivers/net/e2100.c
@@ -72,12 +72,12 @@
#define E21_SAPROM 0x10 /* Offset to station address data. */
#define E21_IO_EXTENT 0x20
-static inline void mem_on(short port, volatile char *mem_base,
+static inline void mem_on(short port, unsigned long mem_base,
unsigned char start_page )
{
/* This is a little weird: set the shared memory window by doing a
read. The low address bits specify the starting page. */
- readb(mem_base+start_page);
+ isa_readb(mem_base+start_page);
inb(port + E21_MEM_ENABLE);
outb(E21_MEM_ON, port + E21_MEM_ENABLE + E21_MEM_ON);
}
@@ -300,15 +300,15 @@
{
short ioaddr = dev->base_addr;
- char *shared_mem = (char *)dev->mem_start;
+ unsigned long shared_mem = dev->mem_start;
mem_on(ioaddr, shared_mem, ring_page);
#ifdef notdef
/* Officially this is what we are doing, but the readl() is faster */
- memcpy_fromio(hdr, shared_mem, sizeof(struct e8390_pkt_hdr));
+ isa_memcpy_fromio(hdr, shared_mem, sizeof(struct e8390_pkt_hdr));
#else
- ((unsigned int*)hdr)[0] = readl(shared_mem);
+ ((unsigned int*)hdr)[0] = isa_readl(shared_mem);
#endif
/* Turn off memory access: we would need to reprogram the window anyway. */
@@ -323,12 +323,11 @@
e21_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset)
{
short ioaddr = dev->base_addr;
- char *shared_mem = (char *)dev->mem_start;
- mem_on(ioaddr, shared_mem, (ring_offset>>8));
+ mem_on(ioaddr, dev->mem_start, (ring_offset>>8));
/* Packet is always in one chunk -- we can copy + cksum. */
- eth_io_copy_and_sum(skb, dev->mem_start + (ring_offset & 0xff), count, 0);
+ isa_eth_io_copy_and_sum(skb, dev->mem_start + (ring_offset & 0xff), count, 0);
mem_off(ioaddr);
}
@@ -338,14 +337,14 @@
int start_page)
{
short ioaddr = dev->base_addr;
- volatile char *shared_mem = (char *)dev->mem_start;
+ unsigned long shared_mem = dev->mem_start;
/* Set the shared memory window start by doing a read, with the low address
bits specifying the starting page. */
- readb(shared_mem + start_page);
+ isa_readb(shared_mem + start_page);
mem_on(ioaddr, shared_mem, start_page);
- memcpy_toio(shared_mem, buf, count);
+ isa_memcpy_toio(shared_mem, buf, count);
mem_off(ioaddr);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)