Permalink
Browse files

Catch up to -current.

  • Loading branch information...
1 parent 1669d1d commit 1380fbdac0e6b9b7f9afc8e5dced38c3d2aae33c bjh21 committed Nov 9, 2002
Showing with 5 additions and 3 deletions.
  1. +5 −3 sys/arch/acorn32/mainbus/fd.c
@@ -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 @@ fdcintr(arg)
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 @@ fdcintr(arg)
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);

0 comments on commit 1380fbd

Please sign in to comment.