From a6a904544a03430da971edb0c6cb2fc574348d79 Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Thu, 18 Apr 1996 17:12:21 +0000 Subject: Merge of NetBSD 960317 --- sys/dev/isa/fd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/dev/isa/fd.c') diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 91ab422a591..45564bd20b9 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,5 @@ -/* $NetBSD: fd.c,v 1.84 1996/02/10 18:31:13 thorpej Exp $ */ +/* $OpenBSD: fd.c,v 1.12 1996/04/18 17:12:13 niklas Exp $ */ +/* $NetBSD: fd.c,v 1.85 1996/03/04 04:01:03 mycroft Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles Hannum. @@ -926,7 +927,7 @@ loop: #endif }} #endif - read = bp->b_flags & B_READ; + read = bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE; #ifdef NEWCONFIG at_dma(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, fdc->sc_drq); @@ -1018,7 +1019,7 @@ loop: #ifdef NEWCONFIG at_dma_terminate(fdc->sc_drq); #else - read = bp->b_flags & B_READ; + read = bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE; isa_dmadone(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, fdc->sc_drq); #endif -- cgit v1.2.3