[src/netbsd-1-6]: src/sys/arch/macppc/dev Pull up revision 1.25 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/2b05378db7d9
branches:  netbsd-1-6
changeset: 530422:2b05378db7d9
user:      grant <grant%NetBSD.org@localhost>
date:      Tue Jun 24 09:21:52 2003 +0000

description:
Pull up revision 1.25 (requested by hamajima in ticket #1328):

Fix wdc_obio_dma_init() confused WDC_DMA_LBA48 with WDC_DMA_READ.
This was tested by jtb%netbsd.org@localhost.

diffstat:

 sys/arch/macppc/dev/wdc_obio.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 3d17947d0403 -r 2b05378db7d9 sys/arch/macppc/dev/wdc_obio.c
--- a/sys/arch/macppc/dev/wdc_obio.c    Tue Jun 24 09:19:28 2003 +0000
+++ b/sys/arch/macppc/dev/wdc_obio.c    Tue Jun 24 09:21:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_obio.c,v 1.19.10.1 2002/07/19 01:28:06 lukem Exp $ */
+/*     $NetBSD: wdc_obio.c,v 1.19.10.2 2003/06/24 09:21:52 grant Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -441,16 +441,17 @@
 }
 
 int
-wdc_obio_dma_init(v, channel, drive, databuf, datalen, read)
+wdc_obio_dma_init(v, channel, drive, databuf, datalen, flags)
        void *v;
        void *databuf;
        size_t datalen;
-       int read;
+       int flags;
 {
        struct wdc_obio_softc *sc = v;
        vaddr_t va = (vaddr_t)databuf;
        dbdma_command_t *cmdp;
        u_int cmd, offset;
+       int read = flags & WDC_DMA_READ;
 
        cmdp = sc->sc_dmacmd;
        cmd = read ? DBDMA_CMD_IN_MORE : DBDMA_CMD_OUT_MORE;