[src/netbsd-1-4]: src/sys/dev/ic Pull up rev 1.6 from trunk

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

details:   https://anonhg.NetBSD.org/src/rev/2774c4dd9a8b
branches:  netbsd-1-4
changeset: 468323:2774c4dd9a8b
user:      pk <pk%NetBSD.org@localhost>
date:      Sat Apr 17 10:24:53 1999 +0000

description:
Pull up rev 1.6 from trunk

diffstat:

 sys/dev/ic/lsi64854.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r e986d31b88e8 -r 2774c4dd9a8b sys/dev/ic/lsi64854.c
--- a/sys/dev/ic/lsi64854.c     Fri Apr 16 23:42:40 1999 +0000
+++ b/sys/dev/ic/lsi64854.c     Sat Apr 17 10:24:53 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lsi64854.c,v 1.5 1999/03/23 00:32:27 pk Exp $ */
+/*     $NetBSD: lsi64854.c,v 1.5.2.1 1999/04/17 10:24:53 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -342,12 +342,12 @@
                 bitmask_snprintf(csr, DDMACSR_BITS, bits, sizeof(bits))));
 
        if (csr & (D_ERR_PEND|D_SLAVE_ERR)) {
+               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
+                       bitmask_snprintf(csr, DDMACSR_BITS, bits,sizeof(bits)));
                csr &= ~D_EN_DMA;       /* Stop DMA */
                /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */
                csr |= D_INVALIDATE|D_SLAVE_ERR;
                L64854_SCSR(sc, csr);
-               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
-                       bitmask_snprintf(csr, DDMACSR_BITS, bits,sizeof(bits)));
                return (-1);
        }
 
@@ -461,14 +461,15 @@
        csr = L64854_GCSR(sc);
 
        if (csr & (E_ERR_PEND|E_SLAVE_ERR)) {
+               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
+                       bitmask_snprintf(csr, EDMACSR_BITS, bits,sizeof(bits)));
                csr &= ~L64854_EN_DMA;  /* Stop DMA */
                /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */
                csr |= E_INVALIDATE|E_SLAVE_ERR;
                L64854_SCSR(sc, csr);
-               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
-                       bitmask_snprintf(csr, EDMACSR_BITS, bits,sizeof(bits)));
                DMA_RESET(sc);
                dodrain = 1;
+               return (1);
        }
 
        if (dodrain) {  /* XXX - is this necessary with D_DSBL_WRINVAL on? */
@@ -569,12 +570,13 @@
                 bitmask_snprintf(csr, PDMACSR_BITS, bits, sizeof(bits))));
 
        if (csr & (P_ERR_PEND|P_SLAVE_ERR)) {
+               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
+                       bitmask_snprintf(csr, PDMACSR_BITS, bits,sizeof(bits)));
                csr &= ~P_EN_DMA;       /* Stop DMA */
                /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */
                csr |= P_INVALIDATE|P_SLAVE_ERR;
                L64854_SCSR(sc, csr);
-               printf("%s: error: csr=%s\n", sc->sc_dev.dv_xname,
-                       bitmask_snprintf(csr, PDMACSR_BITS, bits,sizeof(bits)));
+               return (1);
        }
 
        ret = (csr & P_INT_PEND) != 0;