patch-2.3.35 linux/drivers/net/3c503.c

• Lines: 33
• Date: Tue Dec 21 10:17:31 1999
• Orig file: v2.3.34/linux/drivers/net/3c503.c
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.34/linux/drivers/net/3c503.c linux/drivers/net/3c503.c
@@ -103,7 +103,7 @@
 
     for (addr = addrs; *addr; addr++) {
 	int i;
-	unsigned int base_bits = readb(*addr);
+	unsigned int base_bits = isa_readb(*addr);
 	/* Find first set bit. */
 	for(i = 7; i >= 0; i--, base_bits >>= 1)
 	    if (base_bits & 0x1)
@@ -251,18 +251,18 @@
 	{			/* Check the card's memory. */
 	    unsigned long mem_base = dev->mem_start;
 	    unsigned int test_val = 0xbbadf00d;
-	    writel(0xba5eba5e, mem_base);
+	    isa_writel(0xba5eba5e, mem_base);
 	    for (i = sizeof(test_val); i < EL2_MEMSIZE; i+=sizeof(test_val)) {
-		writel(test_val, mem_base + i);
-		if (readl(mem_base) != 0xba5eba5e
-		    || readl(mem_base + i) != test_val) {
+		isa_writel(test_val, mem_base + i);
+		if (isa_readl(mem_base) != 0xba5eba5e
+		    || isa_readl(mem_base + i) != test_val) {
 		    printk("3c503: memory failure or memory address conflict.\n");
 		    dev->mem_start = 0;
 		    ei_status.name = "3c503-PIO";
 		    break;
 		}
 		test_val += 0x55555555;
-		writel(0, mem_base + i);
+		isa_writel(0, mem_base + i);
 	    }
 	}
 #endif  /* EL2MEMTEST */