diff options
| author | alm <alm@FreeBSD.org> | 1994-03-02 08:10:42 +0000 |
|---|---|---|
| committer | alm <alm@FreeBSD.org> | 1994-03-02 08:10:42 +0000 |
| commit | 4e614f6299dc212e02d7debd56720d7102e3b197 (patch) | |
| tree | b34091be9f521810541b130f2706b870820dfeb9 | |
| parent | 38aa409d9c4548b6c158d75e4b9157234ff753b4 (diff) | |
| download | FreeBSD-src-4e614f6299dc212e02d7debd56720d7102e3b197.zip FreeBSD-src-4e614f6299dc212e02d7debd56720d7102e3b197.tar.gz | |
floppy tape support shouldn't interfere with floppy disk driver on
systems with no floppy tape drive (patch from Jim Babb).
| -rw-r--r-- | sys/dev/fdc/fdc.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/fd.c | 7 | ||||
| -rw-r--r-- | sys/isa/fd.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 005a4dc..ff96f7e 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id:$ + * $Id: fd.c,v 1.21 1994/02/14 22:24:23 nate Exp $ * */ @@ -290,15 +290,16 @@ fdattach(dev) || (fdsu >= DRVS_PER_CTLR)) { #else ) { + fd->type = NO_TYPE; #endif #if NFT > 0 /* If BIOS says no floppy, or > 2nd device */ /* Probe for and attach a floppy tape. */ if (ftattach(dev, fdup)) continue; - + if (fdsu < DRVS_PER_CTLR) + fd->type = NO_TYPE; #endif - fd->type = NO_TYPE; continue; } diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 005a4dc..ff96f7e 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id:$ + * $Id: fd.c,v 1.21 1994/02/14 22:24:23 nate Exp $ * */ @@ -290,15 +290,16 @@ fdattach(dev) || (fdsu >= DRVS_PER_CTLR)) { #else ) { + fd->type = NO_TYPE; #endif #if NFT > 0 /* If BIOS says no floppy, or > 2nd device */ /* Probe for and attach a floppy tape. */ if (ftattach(dev, fdup)) continue; - + if (fdsu < DRVS_PER_CTLR) + fd->type = NO_TYPE; #endif - fd->type = NO_TYPE; continue; } diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 005a4dc..ff96f7e 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id:$ + * $Id: fd.c,v 1.21 1994/02/14 22:24:23 nate Exp $ * */ @@ -290,15 +290,16 @@ fdattach(dev) || (fdsu >= DRVS_PER_CTLR)) { #else ) { + fd->type = NO_TYPE; #endif #if NFT > 0 /* If BIOS says no floppy, or > 2nd device */ /* Probe for and attach a floppy tape. */ if (ftattach(dev, fdup)) continue; - + if (fdsu < DRVS_PER_CTLR) + fd->type = NO_TYPE; #endif - fd->type = NO_TYPE; continue; } |
