Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sparc/sparc When powering down, first ask the PROM ...



details:   https://anonhg.NetBSD.org/src/rev/398e6ef7c5aa
branches:  trunk
changeset: 556918:398e6ef7c5aa
user:      pk <pk%NetBSD.org@localhost>
date:      Tue Dec 30 14:29:30 2003 +0000

description:
When powering down, first ask the PROM to do it for us.

diffstat:

 sys/arch/sparc/sparc/machdep.c |  18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diffs (53 lines):

diff -r c423d3e2792f -r 398e6ef7c5aa sys/arch/sparc/sparc/machdep.c
--- a/sys/arch/sparc/sparc/machdep.c    Tue Dec 30 14:17:41 2003 +0000
+++ b/sys/arch/sparc/sparc/machdep.c    Tue Dec 30 14:29:30 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.242 2003/12/30 12:33:22 pk Exp $ */
+/*     $NetBSD: machdep.c,v 1.243 2003/12/30 14:29:30 pk Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.242 2003/12/30 12:33:22 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243 2003/12/30 14:29:30 pk Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
@@ -129,15 +129,10 @@
 
 #include "fb.h"
 #include "power.h"
-#include "tctrl.h"
 
 #if NPOWER > 0
 #include <sparc/dev/power.h>
 #endif
-#if NTCTRL > 0
-#include <machine/tctrl.h>
-#include <sparc/dev/tctrlvar.h>
-#endif
 
 struct vm_map *exec_map = NULL;
 struct vm_map *mb_map = NULL;
@@ -1069,15 +1064,12 @@
 
        /* If powerdown was requested, do it. */
        if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
+               prom_interpret("power-off");
 #if NPOWER > 0
+               /* Fall back on `power' device if the PROM can't do it */ 
                powerdown();
 #endif
-#if NTCTRL > 0
-               tadpole_powerdown();
-#endif
-#if NPOWER > 0 || NTCTRL > 0
-               printf("WARNING: powerdown failed!\n");
-#endif
+               printf("WARNING: powerdown not supported\n");
                /*
                 * RB_POWERDOWN implies RB_HALT... fall into it...
                 */



Home | Main Index | Thread Index | Old Index