[src/netbsd-1-5]: src/sys/arch/sun3/sun3 Pull up revision 1.11 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/015803d81e7f
branches:  netbsd-1-5
changeset: 490375:015803d81e7f
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 04:25:55 2000 +0000

description:
Pull up revision 1.11 (requested by tsutsui):
  Make PROM boot command work properly even after halt on 3/80.

diffstat:

 sys/arch/sun3/sun3/sunmon.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r d04a032cb769 -r 015803d81e7f sys/arch/sun3/sun3/sunmon.c
--- a/sys/arch/sun3/sun3/sunmon.c       Fri Dec 15 04:23:05 2000 +0000
+++ b/sys/arch/sun3/sun3/sunmon.c       Fri Dec 15 04:25:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunmon.c,v 1.9 1998/02/26 19:30:59 gwr Exp $   */
+/*     $NetBSD: sunmon.c,v 1.9.24.1 2000/12/15 04:25:55 he Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -116,6 +116,12 @@
        *romVectorPtr->vector_cmd = sunmon_vcmd;
 #ifdef _SUN3X_
        loadcrp(&mon_crp);
+       /*
+        * The PROM monitor "exit_to_mon" function appears to have problems...
+        * SunOS uses the "abort" function when you halt (bug work-around?)
+        * so we might as well do the same.
+        */
+       asm(" trap #14"); /* mon_exit_to_mon() provokes PROM monitor bug */
 #endif
        mon_exit_to_mon();
        /*NOTREACHED*/