patch-2.1.68 linux/drivers/net/hp-plus.c

• Lines: 32
• Date: Sun Nov 30 12:21:45 1997
• Orig file: v2.1.67/linux/drivers/net/hp-plus.c
• Orig date: Mon Nov 3 13:04:26 1997

diff -u --recursive --new-file v2.1.67/linux/drivers/net/hp-plus.c linux/drivers/net/hp-plus.c
@@ -31,6 +31,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -266,7 +267,7 @@
 	/* Reset the 8390 and HP chip. */
 	option_reg = inw(ioaddr + HPP_OPTION);
 	outw(option_reg & ~(NICReset + ChipReset), ioaddr + HPP_OPTION);
-	SLOW_DOWN_IO; SLOW_DOWN_IO;
+	udelay(5);
 	/* Unreset the board and enable interrupts. */
 	outw(option_reg | (EnableIRQ + NICReset + ChipReset), ioaddr + HPP_OPTION);
 
@@ -307,12 +308,11 @@
 
 	outw(option_reg & ~(NICReset + ChipReset), ioaddr + HPP_OPTION);
 	/* Pause a few cycles for the hardware reset to take place. */
-	SLOW_DOWN_IO;
-	SLOW_DOWN_IO;
+	udelay(5);
 	ei_status.txing = 0;
 	outw(option_reg | (EnableIRQ + NICReset + ChipReset), ioaddr + HPP_OPTION);
 
-	SLOW_DOWN_IO; SLOW_DOWN_IO;
+	udelay(5);
 
 
 	if ((inb_p(ioaddr+NIC_OFFSET+EN0_ISR) & ENISR_RESET) == 0)