summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authordbj <dbj@NetBSD.org>1999-03-02 12:11:24 +0000
committerdbj <dbj@NetBSD.org>1999-03-02 12:11:24 +0000
commite7058e7205e8eefd4e6025b2eec3f73ebb4b5b82 (patch)
treee89cb711aae5ac0deaed39f106640932e5de1fb0 /sys
parent21fa5d138599ac01ff186858bfc0cc00ee4f662b (diff)
turn on diagnostic check in dma for controller bits at shutdown.
adjusted esp overrun to avoid diagnostic check triggering.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/next68k/dev/esp.c4
-rw-r--r--sys/arch/next68k/dev/espvar.h4
-rw-r--r--sys/arch/next68k/dev/nextdma.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/next68k/dev/esp.c b/sys/arch/next68k/dev/esp.c
index ef986d9714d..267f473d5f4 100644
--- a/sys/arch/next68k/dev/esp.c
+++ b/sys/arch/next68k/dev/esp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.20 1999/02/14 10:19:51 dbj Exp $ */
+/* $NetBSD: esp.c,v 1.21 1999/03/02 12:11:24 dbj Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -696,7 +696,7 @@ esp_dma_setup(sc, addr, len, datain, dmasize)
/* @@@ next dma overrun lossage */
if (!esc->sc_datain) {
- esc->sc_tail_size += 2*ESP_DMA_OVERRUN;
+ esc->sc_tail_size += ESP_DMA_OVERRUN;
}
{
diff --git a/sys/arch/next68k/dev/espvar.h b/sys/arch/next68k/dev/espvar.h
index 5494a6f052a..6ecc00f0311 100644
--- a/sys/arch/next68k/dev/espvar.h
+++ b/sys/arch/next68k/dev/espvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: espvar.h,v 1.9 1999/02/14 10:19:51 dbj Exp $ */
+/* $NetBSD: espvar.h,v 1.10 1999/03/02 12:11:24 dbj Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@ struct esp_softc {
* buffer into a "tail" buffer that we can control more carefully.
* We then chain this extra buffer onto the end.
*/
-#define ESP_DMA_OVERRUN 2*DMA_ENDALIGNMENT
+#define ESP_DMA_OVERRUN 3*DMA_ENDALIGNMENT
#define ESP_DMA_MAXTAIL 128
#define ESP_DMA_TAILBUFSIZE (ESP_DMA_MAXTAIL+2*DMA_ENDALIGNMENT+ESP_DMA_OVERRUN)
bus_dmamap_t sc_tail_dmamap;
diff --git a/sys/arch/next68k/dev/nextdma.c b/sys/arch/next68k/dev/nextdma.c
index f84133989f0..2b951812a66 100644
--- a/sys/arch/next68k/dev/nextdma.c
+++ b/sys/arch/next68k/dev/nextdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdma.c,v 1.12 1999/02/14 10:19:51 dbj Exp $ */
+/* $NetBSD: nextdma.c,v 1.13 1999/03/02 12:11:25 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -560,7 +560,7 @@ nextdma_intr(arg)
#endif
#endif
-#if 0
+#if 1
#ifdef DIAGNOSTIC
if (state & (DMACSR_SUPDATE|DMACSR_ENABLE)) {
next_dma_print(nd);