Module Name: src Committed By: skrll Date: Sat Jan 19 10:22:25 UTC 2013
Modified Files: src/sys/arch/arm/arm32: arm32_reboot.c Log Message: Avoid warning from cngetc byt doing the proper cnpollc dance To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/arm32/arm32_reboot.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/arm/arm32/arm32_reboot.c diff -u src/sys/arch/arm/arm32/arm32_reboot.c:1.2 src/sys/arch/arm/arm32/arm32_reboot.c:1.3 --- src/sys/arch/arm/arm32/arm32_reboot.c:1.2 Wed Sep 5 06:29:09 2012 +++ src/sys/arch/arm/arm32/arm32_reboot.c Sat Jan 19 10:22:25 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_reboot.c,v 1.2 2012/09/05 06:29:09 skrll Exp $ */ +/* $NetBSD: arm32_reboot.c,v 1.3 2013/01/19 10:22:25 skrll Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.2 2012/09/05 06:29:09 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.3 2013/01/19 10:22:25 skrll Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -147,7 +147,9 @@ cpu_reboot(int howto, char *bootstr) doshutdownhooks(); printf("The operating system has halted.\r\n"); printf("Please press any key to reboot.\r\n"); + cnpollc(true); /* for proper keyboard command handling */ cngetc(); + cnpollc(false); printf("rebooting...\r\n"); if (cpu_reset_address) (*cpu_reset_address)();