Module Name: src
Committed By: tsutsui
Date: Wed Feb 9 09:32:50 UTC 2011
Modified Files:
src/sys/arch/hp300/hp300: autoconf.c machdep.c
Log Message:
NHIL is no more.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/hp300/hp300/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.95 src/sys/arch/hp300/hp300/autoconf.c:1.96
--- src/sys/arch/hp300/hp300/autoconf.c:1.95 Wed Feb 9 09:29:57 2011
+++ src/sys/arch/hp300/hp300/autoconf.c Wed Feb 9 09:32:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.96 2011/02/09 09:32:49 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.95 2011/02/09 09:29:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.96 2011/02/09 09:32:49 tsutsui Exp $");
#include "dvbox.h"
#include "gbox.h"
@@ -827,7 +827,8 @@
dnkbdcnattach(bst, FRODO_BASE + FRODO_APCI_OFFSET(0))
#endif
-#if NHIL > 0
+#if NHILKBD > 0
+ /* not yet */
hilkbdcnattach(bst, HIL_BASE);
#endif
;
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.217 src/sys/arch/hp300/hp300/machdep.c:1.218
--- src/sys/arch/hp300/hp300/machdep.c:1.217 Tue Feb 8 20:20:13 2011
+++ src/sys/arch/hp300/hp300/machdep.c Wed Feb 9 09:32:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.217 2011/02/08 20:20:13 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.218 2011/02/09 09:32:49 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.217 2011/02/08 20:20:13 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.218 2011/02/09 09:32:49 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -1022,7 +1022,8 @@
static int innmihand; /* simple mutex */
/*
- * Level 7 interrupts can be caused by the keyboard or parity errors.
+ * Level 7 interrupts can be caused by HIL keyboards (in cooked mode only,
+ * but we run them in raw mode) or parity errors.
*/
void
nmihand(struct frame frame)
@@ -1033,57 +1034,12 @@
return;
innmihand = 1;
-#if NHIL > 0
- /* Check for keyboard <CRTL>+<SHIFT>+<RESET>. */
- if (kbdnmi()) {
- printf("Got a keyboard NMI");
-
- /*
- * We can:
- *
- * - enter DDB
- *
- * - Start the crashandburn sequence
- *
- * - Ignore it.
- */
-#ifdef DDB
- printf(": entering debugger\n");
- Debugger();
-#else
-#ifdef PANICBUTTON
- if (panicbutton) {
- /* XXX */
- callout_init(&candbtimer_ch, 0);
- if (crashandburn) {
- crashandburn = 0;
- printf(": CRASH AND BURN!\n");
- panic("forced crash");
- } else {
- /* Start the crashandburn sequence */
- printf("\n");
- crashandburn = 1;
- callout_reset(&candbtimer_ch, hz / candbdiv,
- candbtimer, NULL);
- }
- } else
-#endif /* PANICBUTTON */
- printf(": ignoring\n");
-#endif /* DDB */
-
- goto nmihand_out; /* no more work to do */
- }
-#endif
-
if (parityerror(&frame))
return;
/* panic?? */
printf("unexpected level 7 interrupt ignored\n");
-#if NHIL > 0
-nmihand_out:
innmihand = 0;
-#endif
}
/*
