[src/netbsd-1-5]: src/sys/dev/ic Pull up 1.22, approved by thorpej:

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

details:   https://anonhg.NetBSD.org/src/rev/d0c0b2b19899
branches:  netbsd-1-5
changeset: 488271:d0c0b2b19899
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Jun 26 08:49:11 2000 +0000

description:
Pull up 1.22, approved by thorpej:
don't bus_dmamap_sync the script dma map if it lives in the on-chip RAM.

diffstat:

 sys/dev/ic/siop.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 481902d48aaa -r d0c0b2b19899 sys/dev/ic/siop.c
--- a/sys/dev/ic/siop.c Mon Jun 26 08:46:58 2000 +0000
+++ b/sys/dev/ic/siop.c Mon Jun 26 08:49:11 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop.c,v 1.21 2000/06/13 13:59:17 bouyer Exp $ */
+/*     $NetBSD: siop.c,v 1.21.2.1 2000/06/26 08:49:11 bouyer Exp $     */
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -331,8 +331,10 @@
            htole32(sc->sc_scriptaddr + Ent_reselect);
 
        /* start script */
-       bus_dmamap_sync(sc->sc_dmat, sc->sc_scriptdma, 0, NBPG,
-           BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+       if ((sc->features & SF_CHIP_RAM) == 0) {
+               bus_dmamap_sync(sc->sc_dmat, sc->sc_scriptdma, 0, NBPG,
+                   BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+       }
        siop_shed_sync(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
        bus_space_write_4(sc->sc_rt, sc->sc_rh, SIOP_DSP,
            sc->sc_scriptaddr + Ent_reselect);