From 74d2d21c68d17809d1f0082c6a039c667185096e Mon Sep 17 00:00:00 2001
From: John Dyson <dyson@FreeBSD.org>
Date: Sat, 22 Apr 1995 22:44:30 +0000
Subject: [PATCH] Change the initial delay in wdwait to a DELAY macro call.  It
 is really too long, but does not impact performance very much when using the
 NSECS_MULTI option.  This will help solve some mysterious IDE I/O problems.

---
 sys/i386/isa/wd.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d729cc6b0d0a..448cf3838c69 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.72 1995/04/12 20:48:10 wollman Exp $
+ *	$Id: wd.c,v 1.73 1995/04/14 22:31:58 phk Exp $
  */
 
 /* TODO:
@@ -1923,13 +1923,13 @@ wdwait(struct disk *du, u_char bits_wanted, int timeout)
 	wdc = du->dk_port;
 	timeout += POLLING;
 
-	/* dummy read for delay */
-	/*
-	 * the reason that we are reading from an *unused* port,
-	 * is that it might be *really* fast to read from the
-	 * wd port.
-	 */
-	(void) inb(0x84);
+/*
+ * This delay is really too long, but does not impact the performance
+ * as much when using the NSECS_MULTI option.  Shorter delays have
+ * caused I/O errors on some drives and system configs.  This should
+ * probably be fixed if we develop a better short term delay mechanism.
+ */
+	DELAY(1);
 
 	do {
 #ifdef WD_COUNT_RETRIES