summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-07-06 12:54:56 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-07-06 12:54:56 +0000
commit3da26f03c7202ef499ddd02620a74f71733662c5 (patch)
tree00b66719dc2cfaa7ec9e371ce9722b5c7a912dc2
parent96c6b215898b1327e80aa4483f8c9b87f6a4f2f7 (diff)
Make the handling of going into ddb from the console more like the
other architectures.
-rw-r--r--sys/arch/mvme68k/dev/cl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index 4c6cefc0ba5..fa1147becdd 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl.c,v 1.20 2000/03/26 23:31:58 deraadt Exp $ */
+/* $OpenBSD: cl.c,v 1.21 2000/07/06 12:54:55 art Exp $ */
/*
* Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -49,6 +49,10 @@
#include <sys/syslog.h>
#include "cl.h"
+#ifdef DDB
+#include <ddb/db_var.h>
+#endif
+
#include "pcctwo.h"
#if NPCCTWO > 0
@@ -1638,9 +1642,7 @@ cl_rxintr(sc)
int i;
u_char reoir;
u_char buffer[CL_FIFO_MAX +1];
-#ifdef CONSOLEBREAKDDB
int wantddb = 0;
-#endif
rir = sc->cl_reg->cl_rir;
if((rir & 0x40) == 0x0) {
@@ -1673,10 +1675,8 @@ cl_rxintr(sc)
reoir = 0x08;
} else
if (risrl & 0x01) {
-#ifdef CONSOLEBREAKDDB
if (sc->sc_cl[channel].cl_consio)
wantddb = 1;
-#endif
cl_break(sc, channel);
reoir = 0x08;
}
@@ -1801,8 +1801,8 @@ channel, nbuf, cnt, status);
reoir = 0x08;
sc->cl_reg->cl_reoir = reoir;
}
-#ifdef CONSOLEBREAKDDB
- if (wantddb)
+#ifdef DDB
+ if (wantddb && db_console)
Debugger();
#endif
return 1;