From 1ca6f46d56a6107dd6bd1f25e1411953233da8a6 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Wed, 30 Nov 1994 12:04:28 +0000
Subject: [PATCH] Reverse the meaning of previous change. Now floppy tape
 support is *disabled* unless you specifically request otherwise.  Poul wanted
 it this way, and I guess I'm not going to argue though it may seem
 counter-intuitive.  We can always change it back, later.

---
 sys/dev/fdc/fdc.c | 12 +++++-------
 sys/i386/isa/fd.c | 12 +++++-------
 sys/isa/fd.c      | 12 +++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 39f14df47f71..628057cf9003 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.43 1994/11/18 10:18:36 phk Exp $
+ *	$Id: fd.c,v 1.44 1994/11/29 15:46:20 jkh Exp $
  *
  */
 
@@ -51,7 +51,7 @@
 #include "fd.h"
 
 /* Flags */
-#define FT_DONT_PROBE		0x1
+#define FT_PROBE		0x1
 
 #if NFDC > 0
 
@@ -432,11 +432,9 @@ fdattach(dev)
 			fd->type = NO_TYPE;
 #endif
 #if NFT > 0
-				/* If BIOS says no floppy, or > 2nd device */
-				/* Probe for and attach a floppy tape.     */
-			if (dev->id_flags & FT_DONT_PROBE)
-				printf(" [fd%d: floppy tape not probed]", fdu);
-			else if (ftattach(dev, fdup))
+			/* If BIOS says no floppy, or > 2nd device */
+			/* Probe for and attach a floppy tape.     */
+			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 39f14df47f71..628057cf9003 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.43 1994/11/18 10:18:36 phk Exp $
+ *	$Id: fd.c,v 1.44 1994/11/29 15:46:20 jkh Exp $
  *
  */
 
@@ -51,7 +51,7 @@
 #include "fd.h"
 
 /* Flags */
-#define FT_DONT_PROBE		0x1
+#define FT_PROBE		0x1
 
 #if NFDC > 0
 
@@ -432,11 +432,9 @@ fdattach(dev)
 			fd->type = NO_TYPE;
 #endif
 #if NFT > 0
-				/* If BIOS says no floppy, or > 2nd device */
-				/* Probe for and attach a floppy tape.     */
-			if (dev->id_flags & FT_DONT_PROBE)
-				printf(" [fd%d: floppy tape not probed]", fdu);
-			else if (ftattach(dev, fdup))
+			/* If BIOS says no floppy, or > 2nd device */
+			/* Probe for and attach a floppy tape.     */
+			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 39f14df47f71..628057cf9003 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.43 1994/11/18 10:18:36 phk Exp $
+ *	$Id: fd.c,v 1.44 1994/11/29 15:46:20 jkh Exp $
  *
  */
 
@@ -51,7 +51,7 @@
 #include "fd.h"
 
 /* Flags */
-#define FT_DONT_PROBE		0x1
+#define FT_PROBE		0x1
 
 #if NFDC > 0
 
@@ -432,11 +432,9 @@ fdattach(dev)
 			fd->type = NO_TYPE;
 #endif
 #if NFT > 0
-				/* If BIOS says no floppy, or > 2nd device */
-				/* Probe for and attach a floppy tape.     */
-			if (dev->id_flags & FT_DONT_PROBE)
-				printf(" [fd%d: floppy tape not probed]", fdu);
-			else if (ftattach(dev, fdup))
+			/* If BIOS says no floppy, or > 2nd device */
+			/* Probe for and attach a floppy tape.     */
+			if ((dev->id_flags & FT_PROBE) && ftattach(dev, fdup))
 				continue;
 			if (fdsu < DRVS_PER_CTLR) 
 				fd->type = NO_TYPE;