[src/bjh21-hydra]: src/sys/arch/acorn32/mainbus Catch up to -current.

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e0a9b02d20f3
branches:  bjh21-hydra
changeset: 538373:e0a9b02d20f3
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Nov 09 16:31:24 2002 +0000

description:
Catch up to -current.

diffstat:

 sys/arch/acorn32/mainbus/fd.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 33733401ac1f -r e0a9b02d20f3 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Sat Nov 09 16:10:23 2002 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Sat Nov 09 16:31:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.10.2.1 2002/10/24 22:34:47 bjh21 Exp $        */
+/*     $NetBSD: fd.c,v 1.10.2.2 2002/11/09 16:31:24 bjh21 Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1136,7 +1136,8 @@
                return 1;
 
        case SEEKCOMPLETE:
-               disk_unbusy(&fd->sc_dk, 0);     /* no data on seek */
+               /* no data on seek */
+               disk_unbusy(&fd->sc_dk, 0, 0);
 
                /* Make sure seek really happened. */
                out_fdc(iot, ioh, NE7CMD_SENSEI);
@@ -1163,7 +1164,8 @@
        case IOCOMPLETE: /* IO DONE, post-analyze */
                callout_stop(&fdc->sc_timo_ch);
 
-               disk_unbusy(&fd->sc_dk, (bp->b_bcount - bp->b_resid));
+               disk_unbusy(&fd->sc_dk, (bp->b_bcount - bp->b_resid),
+                   (bp->b_flags & B_READ));
 
                if (fdcresult(fdc) != 7 || (st0 & 0xf8) != 0) {
                        fiq_release(&fdc->sc_fh);