[src/trunk]: src/sys/arch Call cnpollc(9) before cngetc(9) as the cons(9) man...

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

details:   https://anonhg.NetBSD.org/src/rev/ec0ebfe281e1
branches:  trunk
changeset: 989008:ec0ebfe281e1
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Oct 09 20:00:41 2021 +0000

description:
Call cnpollc(9) before cngetc(9) as the cons(9) man page says.

Currently most ports do nothing in cnpollc(9), but this is required to
handle wskbd(9) .set_leds op in cngetc(9) properly, at least on luna68k.

diffstat:

 sys/arch/atari/atari/machdep.c     |  9 ++++++---
 sys/arch/cesfic/cesfic/machdep.c   |  8 ++++++--
 sys/arch/hp300/hp300/machdep.c     |  8 ++++++--
 sys/arch/luna68k/luna68k/machdep.c |  6 ++++--
 sys/arch/mac68k/mac68k/machdep.c   |  6 ++++--
 sys/arch/mvme68k/mvme68k/machdep.c |  6 ++++--
 sys/arch/news68k/news68k/machdep.c |  6 ++++--
 sys/arch/next68k/next68k/machdep.c |  6 ++++--
 sys/arch/x68k/x68k/machdep.c       |  8 ++++++--
 9 files changed, 44 insertions(+), 19 deletions(-)

diffs (284 lines):

diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/atari/atari/machdep.c    Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.184 2021/01/03 17:42:10 thorpej Exp $    */
+/*     $NetBSD: machdep.c,v 1.185 2021/10/09 20:00:41 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.184 2021/01/03 17:42:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.185 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -440,7 +440,10 @@
 
 #if defined(DDB) || defined(PANICWAIT)
        printf("Do you want to dump memory? [y]");
-       cnputc(i = cngetc());
+       cnpollc(1);
+       i = cngetc();
+       cnpollc(0);
+       cnputc(i);
        switch (i) {
        case 'n':
        case 'N':
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/cesfic/cesfic/machdep.c
--- a/sys/arch/cesfic/cesfic/machdep.c  Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/cesfic/cesfic/machdep.c  Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.71 2020/06/11 19:20:43 ad Exp $  */
+/*     $NetBSD: machdep.c,v 1.72 2021/10/09 20:00:41 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2020/06/11 19:20:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_bufcache.h"
 #include "opt_ddb.h"
@@ -337,7 +337,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
@@ -345,7 +347,9 @@
        /* Finally, halt/reboot the system. */
        if (howto & RB_HALT) {
                printf("System halted.  Hit any key to reboot.\n\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
        }
 
        printf("rebooting...\n");
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/hp300/hp300/machdep.c
--- a/sys/arch/hp300/hp300/machdep.c    Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/hp300/hp300/machdep.c    Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.235 2021/08/06 05:22:21 tsutsui Exp $    */
+/*     $NetBSD: machdep.c,v 1.236 2021/10/09 20:00:41 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.235 2021/08/06 05:22:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.236 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -612,7 +612,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
@@ -620,7 +622,9 @@
        /* Finally, halt/reboot the system. */
        if (howto & RB_HALT) {
                printf("System halted.  Hit any key to reboot.\n\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
        }
 
        printf("rebooting...\n");
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/luna68k/luna68k/machdep.c
--- a/sys/arch/luna68k/luna68k/machdep.c        Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/luna68k/luna68k/machdep.c        Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.107 2021/09/25 15:18:38 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.108 2021/10/09 20:00:41 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2021/09/25 15:18:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -472,7 +472,9 @@
        }
        if (howto & RB_HALT) {
                printf("System halted.  Hit any key to reboot.\n\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
        }
 
        printf("rebooting...\n");
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.362 2021/04/28 02:28:05 rin Exp $        */
+/*     $NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.362 2021/04/28 02:28:05 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.363 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_adb.h"
 #include "opt_compat_netbsd.h"
@@ -500,7 +500,9 @@
                printf("\n");
                printf("The operating system has halted.\n");
                printf("Please press any key to reboot.\n\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
        }
 
        /* Map the last physical page VA = PA for doboot() */
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/mvme68k/mvme68k/machdep.c
--- a/sys/arch/mvme68k/mvme68k/machdep.c        Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/mvme68k/mvme68k/machdep.c        Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.158 2020/06/11 19:20:44 ad Exp $ */
+/*     $NetBSD: machdep.c,v 1.159 2021/10/09 20:00:41 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.158 2020/06/11 19:20:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.159 2021/10/09 20:00:41 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m060sp.h"
@@ -654,7 +654,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/news68k/news68k/machdep.c
--- a/sys/arch/news68k/news68k/machdep.c        Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/news68k/news68k/machdep.c        Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.109 2021/08/06 05:53:50 tsutsui Exp $    */
+/*     $NetBSD: machdep.c,v 1.110 2021/10/09 20:00:42 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2021/08/06 05:53:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2021/10/09 20:00:42 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -321,7 +321,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/next68k/next68k/machdep.c
--- a/sys/arch/next68k/next68k/machdep.c        Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/next68k/next68k/machdep.c        Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.115 2020/06/11 19:20:44 ad Exp $ */
+/*     $NetBSD: machdep.c,v 1.116 2021/10/09 20:00:42 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2020/06/11 19:20:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.116 2021/10/09 20:00:42 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -469,7 +469,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
diff -r b425664fd655 -r ec0ebfe281e1 sys/arch/x68k/x68k/machdep.c
--- a/sys/arch/x68k/x68k/machdep.c      Sat Oct 09 19:18:52 2021 +0000
+++ b/sys/arch/x68k/x68k/machdep.c      Sat Oct 09 20:00:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.206 2021/08/06 04:21:56 isaki Exp $      */
+/*     $NetBSD: machdep.c,v 1.207 2021/10/09 20:00:42 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.206 2021/08/06 04:21:56 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.207 2021/10/09 20:00:42 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -518,7 +518,9 @@
 #if defined(PANICWAIT) && !defined(DDB)
        if ((howto & RB_HALT) == 0 && panicstr) {
                printf("hit any key to reboot...\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
                printf("\n");
        }
 #endif
@@ -551,7 +553,9 @@
                /* PASSTHROUGH even if came back */
        } else if ((howto & RB_HALT) == RB_HALT) {
                printf("System halted.  Hit any key to reboot.\n\n");
+               cnpollc(1);
                (void)cngetc();
+               cnpollc(0);
        }
 
        printf("rebooting...\n");