diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-24 14:36:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-24 14:36:37 +0000 |
| commit | 241733d7659db017b85686a1d68037e2e45ca036 (patch) | |
| tree | e2e1762af24c1413c816f3f9e58099a8533dd1a5 /sys/arch/sparc/dev/fd.c | |
| parent | 5f042ee4de3474f1c14f1e2ad7e659c5903e87d9 (diff) | |
pretty; delay properly during drive probe
Diffstat (limited to 'sys/arch/sparc/dev/fd.c')
| -rw-r--r-- | sys/arch/sparc/dev/fd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index 5561da1b089..ed66fa9c3a5 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -431,11 +431,12 @@ fdmatch(parent, match, aux) if (fdc->sc_flags & FDC_82077) { /* select drive and turn on motor */ *fdc->sc_reg_dor = drive | FDO_FRST | FDO_MOEN(drive); - /* wait for motor to spin up */ - delay(250000); } else { auxregbisc(AUXIO_FDS, 0); } + /* wait for motor to spin up */ + delay(250000); + fdc->sc_nstat = 0; out_fdc(fdc, NE7CMD_RECAL); out_fdc(fdc, drive); @@ -470,12 +471,10 @@ fdmatch(parent, match, aux) if (n != 2 || (fdc->sc_status[0] & 0xf8) != 0x20) return 0; /* turn off motor */ - if (fdc->sc_flags & FDC_82077) { - /* select drive and turn on motor */ + if (fdc->sc_flags & FDC_82077) *fdc->sc_reg_dor = FDO_FRST; - } else { + else auxregbisc(0, AUXIO_FDS); - } return 1; } @@ -497,7 +496,7 @@ fdattach(parent, self, aux) /* XXX Allow `flags' to override device type? */ if (type) - printf(": %s %d cyl, %d head, %d sec\n", type->name, + printf(": %s, %d cyl, %d head, %d sec\n", type->name, type->tracks, type->heads, type->sectrac); else printf(": density unknown\n"); |