From debc473329cd83f27d866eedce7f3671919700ce Mon Sep 17 00:00:00 2001 From: scottr Date: Mon, 16 Sep 1996 04:32:28 +0000 Subject: [PATCH] - Add a ZS_CONSOLE_ABORT option to enable a serial console break to force a drop to the system debugger. WARNING: this used to be the default behavior! Modify custom kernel configs accordingly. - Check for ZS_HWFLAG_CONABRT in zs_abort(), and don't abort if it's not set. --- sys/arch/mac68k/dev/zs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c index 5ce2cd7cf855..bbf715f9478b 100644 --- a/sys/arch/mac68k/dev/zs.c +++ b/sys/arch/mac68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.6 1996/08/27 21:56:13 cgd Exp $ */ +/* $NetBSD: zs.c,v 1.7 1996/09/16 04:32:28 scottr Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -677,7 +677,10 @@ zscninit(struct consdev * cp) mac68k_set_io_offsets(IOBase); zs_conschan = (struct zschan *) -1; zs_consunit = chan; - zs_hwflags[0][zs_consunit] = ZS_HWFLAG_CONSOLE | ZS_HWFLAG_CONABRT; + zs_hwflags[0][zs_consunit] = ZS_HWFLAG_CONSOLE; +#ifdef ZS_DDB_BREAK + zs_hwflags[0][zs_consunit] |= ZS_HWFLAG_CONABRT; +#endif zs_init(); /* * zsinit will set up the addresses of the scc. It will also, if