Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hp300/stand/common If building without ITECONSOLE, ...



details:   https://anonhg.NetBSD.org/src/rev/16bf6ffea913
branches:  trunk
changeset: 475089:16bf6ffea913
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jul 31 21:49:03 1999 +0000

description:
If building without ITECONSOLE, don't install our own NMI handler.  Just
leave the ROM's NMI handler in place.

diffstat:

 sys/arch/hp300/stand/common/srt0.S |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r 426be5e7b00b -r 16bf6ffea913 sys/arch/hp300/stand/common/srt0.S
--- a/sys/arch/hp300/stand/common/srt0.S        Sat Jul 31 21:17:08 1999 +0000
+++ b/sys/arch/hp300/stand/common/srt0.S        Sat Jul 31 21:49:03 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srt0.S,v 1.7 1999/07/31 17:20:22 thorpej Exp $ */
+/*     $NetBSD: srt0.S,v 1.8 1999/07/31 21:49:03 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -89,8 +89,16 @@
        movl    #_ASM_LABEL(__trap),a0@ | make it direct to __trap
        addql   #6,a0                   | move to next vector addr
        dbf     d0,1b                   | go til done
+#ifdef ITECONSOLE
        movl    #NMIRESET,a0            | NMI keyboard reset addr
        movl    #nmi,a0@                | catch in reset routine
+#else
+       /*
+        * Built without ITE console support; leave the ROM's NMI
+        * vector in place, so the system will still reset if a
+        * keyboard NMI is issued.
+        */
+#endif
 
 /*
  * Determine our SPU type and look for internal HP-IB
@@ -317,11 +325,13 @@
 Lstop:
        stop    #0x2700                 | stop cold
 
+#ifdef ITECONSOLE
 ASENTRY_NOPROFILE(nmi)
        movw    #18,BOOTTYPE            | mark as system switch
        jsr     _C_LABEL(kbdnmi)        | clear the interrupt, and
                                        |   reset the system
        stop    #0                      | SCREEEECH!
+#endif
 
 ENTRY_NOPROFILE(call_req_reboot)
        jmp     0x1A4                   | call ROM reboot function



Home | Main Index | Thread Index | Old Index