Module Name: src
Committed By: martin
Date: Thu Oct 20 07:26:03 UTC 2016
Modified Files:
src/sys/arch/evbmips/cavium: machdep.c
Log Message:
Rin Okuyama in PR port-evbmips/51563: wait for console input after halting
the machine.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/cavium/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/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.7 src/sys/arch/evbmips/cavium/machdep.c:1.8
--- src/sys/arch/evbmips/cavium/machdep.c:1.7 Fri Aug 26 13:51:55 2016
+++ src/sys/arch/evbmips/cavium/machdep.c Thu Oct 20 07:26:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.7 2016/08/26 13:51:55 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.8 2016/10/20 07:26:03 martin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -114,7 +114,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2016/08/26 13:51:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2016/10/20 07:26:03 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -448,6 +448,9 @@ haltsys:
printf("\n");
printf("The operating system has halted.\n");
printf("Please press any key to reboot.\n\n");
+ cnpollc(1); /* For proper keyboard command handling */
+ cngetc();
+ cnpollc(0);
}
printf("%s\n\n", ((howto & RB_HALT) != 0) ? "halted." : "rebooting...");
