From: rees <rees@openbsd.org>
Date: Mon, 7 Apr 1997 22:48:08 +0000 (+0000)
Subject: cf_flags & 0x20 forces device to be found even if it won't probe.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=768789fc8a9674f69b725996c16fda7f223f851e;p=openbsd

cf_flags & 0x20 forces device to be found even if it won't probe.
---

diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index cd59a043758..adff6a5703d 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.33 1996/12/05 17:40:01 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.34 1997/04/07 22:48:08 rees Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -204,7 +204,8 @@ fdprobe(parent, match, aux)
 		printf("\n");
 	}
 #endif
-	if (n != 2 || (fdc->sc_status[0] & 0xf8) != 0x20)
+	/* flags & 0x20 forces the drive to be found even if it won't probe */
+	if (!(fa->fa_flags & 0x20) && (n != 2 || (fdc->sc_status[0] & 0xf8) != 0x20))
 		return 0;
 	/* turn off motor */
 	bus_space_write_1(iot, ioh, fdout, FDO_FRST);