[src/trunk]: src/sys/arch/sparc/dev When winding down a DMA transfer, don't c...

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

details:   https://anonhg.NetBSD.org/src/rev/334d68e402cd
branches:  trunk
changeset: 494033:334d68e402cd
user:      pk <pk%NetBSD.org@localhost>
date:      Thu Jun 29 14:06:40 2000 +0000

description:
When winding down a DMA transfer, don't complain about the actual
transfer count being smaller than the minimum transfer size for which
we would use DMA. The device may be disconnecting, to complete the
transaction at a later time. Just let the 5380 engine proceed acting
on the current SCSI bus phase.

diffstat:

 sys/arch/sparc/dev/si.c |  8 ++------
 sys/arch/sparc/dev/sw.c |  8 +-------
 2 files changed, 3 insertions(+), 13 deletions(-)

diffs (44 lines):

diff -r 84e71ba04195 -r 334d68e402cd sys/arch/sparc/dev/si.c
--- a/sys/arch/sparc/dev/si.c   Thu Jun 29 12:49:18 2000 +0000
+++ b/sys/arch/sparc/dev/si.c   Thu Jun 29 14:06:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: si.c,v 1.63 2000/06/26 19:54:08 pk Exp $       */
+/*     $NetBSD: si.c,v 1.64 2000/06/29 14:06:40 pk Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -910,11 +910,7 @@
                    resid, ntrans);
        }
 #endif
-       if (ntrans < MIN_DMA_LEN) {
-               printf("si: fifo count: 0x%x\n", resid);
-               ncr_sc->sc_state |= NCR_ABORTING;
-               goto out;
-       }
+
        if (ntrans > ncr_sc->sc_datalen)
                panic("si_dma_stop: excess transfer");
 
diff -r 84e71ba04195 -r 334d68e402cd sys/arch/sparc/dev/sw.c
--- a/sys/arch/sparc/dev/sw.c   Thu Jun 29 12:49:18 2000 +0000
+++ b/sys/arch/sparc/dev/sw.c   Thu Jun 29 14:06:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sw.c,v 1.1 2000/06/26 19:54:09 pk Exp $        */
+/*     $NetBSD: sw.c,v 1.2 2000/06/29 14:06:41 pk Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -910,12 +910,6 @@
        }
 #endif
 
-       if (ntrans < MIN_DMA_LEN) {
-               printf("sw: short transfer\n");
-               ncr_sc->sc_state |= NCR_ABORTING;
-               goto out;
-       }
-
        if (ntrans > ncr_sc->sc_datalen)
                panic("sw_dma_stop: excess transfer");