diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-17 05:33:14 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-17 05:33:14 +0000 |
commit | 7d0764bb503bb56f3ea958e4ada73f31c0e497e1 (patch) | |
tree | bfb0374f7cceea073537df4991bd14c8c6609dd8 /sys/arch/arc | |
parent | 3f75e3738d2a912db052158e91ef82192d832177 (diff) |
support db_console switch for disabling console ddb
Diffstat (limited to 'sys/arch/arc')
-rw-r--r-- | sys/arch/arc/dev/pccons.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c index e3013ee93af..2310b3a5885 100644 --- a/sys/arch/arc/dev/pccons.c +++ b/sys/arch/arc/dev/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.20 1998/03/16 09:54:01 pefo Exp $ */ +/* $OpenBSD: pccons.c,v 1.21 1998/03/17 05:33:13 deraadt Exp $ */ /* $NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp $ */ /*- @@ -62,6 +62,9 @@ #include <sys/vnode.h> #include <sys/fcntl.h> #include <sys/kernel.h> +#ifdef DDB +#include <ddb/db_var.h> +#endif #include <dev/cons.h> @@ -1702,7 +1705,8 @@ top: #if defined(DDB) && defined(XSERVER_DDB) /* F12 enters the debugger while in X mode */ if (dt == 88) - Debugger(); + if (db_console) + Debugger(); #endif capchar[0] = dt; capchar[1] = 0; @@ -1763,7 +1767,8 @@ top: * Check for cntl-alt-esc. */ if ((dt == 1) && (shift_state & (KB_CTL | KB_ALT)) == (KB_CTL | KB_ALT)) { - Debugger(); + if (db_console) + Debugger(); dt |= 0x80; /* discard esc (ddb discarded ctl-alt) */ } #endif |