Check the status port after waiting for DRQ; some drives seem to be very

slow coming off the bus (eg. Iomega's ATAPI Zip).  Failure to do
this results in a false probe of an ATAPI device with garbage
data.

1 files changed, 9 insertions, 0 deletions

diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 56fbbfbaf43b..09439cb5ae2e 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -422,6 +422,15 @@ static struct atapi_params *atapi_probe (int port, int unit)
 		return (0);
 	}
 
+	/* check that DRQ isn't a fake */
+	if (inb (port + AR_STATUS) == 0xff) {
+		print (("atapiX.%d at 0x%x: no device\n", unit, port));
+		if (unit == 1)
+			/* Select unit 0. */
+			outb (port + AR_DRIVE, ARD_DRIVE0);
+		return (0);
+	}
+
 	/* Obtain parameters. */
 	insw (port + AR_DATA, tb, sizeof(tb) / sizeof(short));