d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverse the meaning of previous change.

Browse Source 
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.
This commit is contained in:
Jordan K. Hubbard 1994-11-30 12:04:28 +00:00
parent f8de047922
commit 1ca6f46d56
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/fdc/fdc.c
View File

@ -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;

12
sys/i386/isa/fd.c
View File

@ -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;

12
sys/isa/fd.c
View File

@ -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;