Module Name: src
Committed By: rin
Date: Tue Dec 6 07:34:22 UTC 2016
Modified Files:
src/sys/arch/powerpc/booke: booke_machdep.c
Log Message:
PR port-evbppc/51564 (myself): wait for console input after halting the machine.
ok joerg
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/booke/booke_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/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.24 src/sys/arch/powerpc/booke/booke_machdep.c:1.25
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.24 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/booke/booke_machdep.c Tue Dec 6 07:34:22 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_machdep.c,v 1.24 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: booke_machdep.c,v 1.25 2016/12/06 07:34:22 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.24 2016/07/11 16:06:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.25 2016/12/06 07:34:22 rin Exp $");
#include "opt_modular.h"
@@ -55,6 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: booke_machde
#include <uvm/uvm_extern.h>
+#include <dev/cons.h>
+
#include <powerpc/pcb.h>
#include <powerpc/spr.h>
#include <powerpc/booke/spr.h>
@@ -275,8 +277,13 @@ cpu_reboot(int howto, char *what)
}
if (howto & RB_HALT) {
- printf("halted\n\n");
+ printf("The operating system has halted.\n"
+ "Press any key to reboot.\n\n");
+ cnpollc(1); /* For proper keyboard command handling */
+ cngetc();
+ cnpollc(0);
+ printf("rebooting...\n\n");
goto reboot; /* XXX for now... */
#ifdef DDB
