[src/netbsd-1-4]: src/sys/arch/x68k/dev Pull up to HEAD 1.16, per MINOURA Mak...

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

details:   https://anonhg.NetBSD.org/src/rev/4adc51406b0d
branches:  netbsd-1-4
changeset: 468347:4adc51406b0d
user:      cjs <cjs%NetBSD.org@localhost>
date:      Mon Apr 19 04:41:34 1999 +0000

description:
Pull up to HEAD 1.16, per MINOURA Makoto <minoura%netbsd.org@localhost>.

diffstat:

 sys/arch/x68k/dev/mha.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r 51b581f6703b -r 4adc51406b0d sys/arch/x68k/dev/mha.c
--- a/sys/arch/x68k/dev/mha.c   Mon Apr 19 04:36:28 1999 +0000
+++ b/sys/arch/x68k/dev/mha.c   Mon Apr 19 04:41:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mha.c,v 1.15 1999/03/24 14:07:38 minoura Exp $ */
+/*     $NetBSD: mha.c,v 1.15.2.1 1999/04/19 04:41:34 cjs Exp $ */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -1687,10 +1687,12 @@
   if (sc->sc_dmasize > 0)
     panic("DMA request while another DMA transfer is in pregress");
 
-  memcpy(sc->sc_dmabuf, p, n);
-  bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, 0, n,
-                 (cw == CMD_SEND_FROM_DMA)?BUS_DMASYNC_PREWRITE
-                                          :BUS_DMASYNC_PREREAD);
+  if (cw == CMD_SEND_FROM_DMA) {
+    memcpy(sc->sc_dmabuf, p, n);
+    bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, 0, n, BUS_DMASYNC_PREWRITE);
+  } else {
+    bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, 0, n, BUS_DMASYNC_PREREAD);
+  }
   sc->sc_p = p;
   sc->sc_dmasize = n;