[src/trunk]: src/sys/arch/hp300/hp300 NHIL is no more.

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c478e6204cfb
branches:  trunk
changeset: 761846:c478e6204cfb
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Feb 09 09:32:49 2011 +0000

description:
NHIL is no more.

diffstat:

 sys/arch/hp300/hp300/autoconf.c |   7 +++--
 sys/arch/hp300/hp300/machdep.c  |  52 +++-------------------------------------
 2 files changed, 8 insertions(+), 51 deletions(-)

diffs (114 lines):

diff -r 29f689b1797b -r c478e6204cfb sys/arch/hp300/hp300/autoconf.c
--- a/sys/arch/hp300/hp300/autoconf.c   Wed Feb 09 09:29:57 2011 +0000
+++ b/sys/arch/hp300/hp300/autoconf.c   Wed Feb 09 09:32:49 2011 +0000
@@ -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
 ;
diff -r 29f689b1797b -r c478e6204cfb sys/arch/hp300/hp300/machdep.c
--- a/sys/arch/hp300/hp300/machdep.c    Wed Feb 09 09:29:57 2011 +0000
+++ b/sys/arch/hp300/hp300/machdep.c    Wed Feb 09 09:32:49 2011 +0000
@@ -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
 }
 
 /*