Module Name: src
Committed By: tsutsui
Date: Sat Sep 25 19:16:32 UTC 2021
Modified Files:
src/sys/arch/atari/atari: trap.c
src/sys/arch/cesfic/cesfic: trap.c
src/sys/arch/hp300/hp300: trap.c
src/sys/arch/luna68k/luna68k: trap.c
src/sys/arch/mac68k/mac68k: trap.c
src/sys/arch/mvme68k/mvme68k: trap.c
src/sys/arch/news68k/news68k: trap.c
src/sys/arch/next68k/next68k: trap.c
src/sys/arch/x68k/x68k: trap.c
Log Message:
Call cnpollc(9) before cngetc(9) as the cons(9) man page says.
Affects only inside #ifdef DEBUG part on "trap during panic" in trap.c
derived from hp300.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/news68k/news68k/trap.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/x68k/x68k/trap.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/atari/atari/trap.c
diff -u src/sys/arch/atari/atari/trap.c:1.116 src/sys/arch/atari/atari/trap.c:1.117
--- src/sys/arch/atari/atari/trap.c:1.116 Thu Nov 21 19:23:59 2019
+++ src/sys/arch/atari/atari/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.116 2019/11/21 19:23:59 ad Exp $ */
+/* $NetBSD: trap.c,v 1.117 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.116 2019/11/21 19:23:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.117 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -277,7 +277,10 @@ kgdb_cont:
printf("Double panic\n");
#ifdef DEBUG
/* XXX Should be a machine dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
Index: src/sys/arch/cesfic/cesfic/trap.c
diff -u src/sys/arch/cesfic/cesfic/trap.c:1.60 src/sys/arch/cesfic/cesfic/trap.c:1.61
--- src/sys/arch/cesfic/cesfic/trap.c:1.60 Thu Nov 21 19:23:59 2019
+++ src/sys/arch/cesfic/cesfic/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.60 2019/11/21 19:23:59 ad Exp $ */
+/* $NetBSD: trap.c,v 1.61 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.60 2019/11/21 19:23:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.61 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -307,7 +307,10 @@ trap(struct frame *fp, int type, unsigne
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/hp300/hp300/trap.c
diff -u src/sys/arch/hp300/hp300/trap.c:1.154 src/sys/arch/hp300/hp300/trap.c:1.155
--- src/sys/arch/hp300/hp300/trap.c:1.154 Thu Nov 21 19:24:00 2019
+++ src/sys/arch/hp300/hp300/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.154 2019/11/21 19:24:00 ad Exp $ */
+/* $NetBSD: trap.c,v 1.155 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.154 2019/11/21 19:24:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.155 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -304,7 +304,10 @@ trap(struct frame *fp, int type, u_int c
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/luna68k/luna68k/trap.c
diff -u src/sys/arch/luna68k/luna68k/trap.c:1.72 src/sys/arch/luna68k/luna68k/trap.c:1.73
--- src/sys/arch/luna68k/luna68k/trap.c:1.72 Thu Nov 21 19:24:00 2019
+++ src/sys/arch/luna68k/luna68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.72 2019/11/21 19:24:00 ad Exp $ */
+/* $NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.72 2019/11/21 19:24:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -273,7 +273,10 @@ trap(struct frame *fp, int type, unsigne
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/mac68k/mac68k/trap.c
diff -u src/sys/arch/mac68k/mac68k/trap.c:1.151 src/sys/arch/mac68k/mac68k/trap.c:1.152
--- src/sys/arch/mac68k/mac68k/trap.c:1.151 Mon Aug 10 10:51:21 2020
+++ src/sys/arch/mac68k/mac68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.151 2020/08/10 10:51:21 rin Exp $ */
+/* $NetBSD: trap.c,v 1.152 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.151 2020/08/10 10:51:21 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.152 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -286,7 +286,10 @@ trap(struct frame *fp, int type, u_int c
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/mvme68k/mvme68k/trap.c
diff -u src/sys/arch/mvme68k/mvme68k/trap.c:1.111 src/sys/arch/mvme68k/mvme68k/trap.c:1.112
--- src/sys/arch/mvme68k/mvme68k/trap.c:1.111 Thu Nov 21 19:24:00 2019
+++ src/sys/arch/mvme68k/mvme68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.111 2019/11/21 19:24:00 ad Exp $ */
+/* $NetBSD: trap.c,v 1.112 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.111 2019/11/21 19:24:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.112 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -327,7 +327,10 @@ trap(struct frame *fp, int type, unsigne
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/news68k/news68k/trap.c
diff -u src/sys/arch/news68k/news68k/trap.c:1.72 src/sys/arch/news68k/news68k/trap.c:1.73
--- src/sys/arch/news68k/news68k/trap.c:1.72 Thu Nov 21 19:24:00 2019
+++ src/sys/arch/news68k/news68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.72 2019/11/21 19:24:00 ad Exp $ */
+/* $NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.72 2019/11/21 19:24:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -296,7 +296,10 @@ trap(struct frame *fp, int type, u_int c
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/next68k/next68k/trap.c
diff -u src/sys/arch/next68k/next68k/trap.c:1.91 src/sys/arch/next68k/next68k/trap.c:1.92
--- src/sys/arch/next68k/next68k/trap.c:1.91 Thu Nov 21 19:24:01 2019
+++ src/sys/arch/next68k/next68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.91 2019/11/21 19:24:01 ad Exp $ */
+/* $NetBSD: trap.c,v 1.92 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* This file was taken from mvme68k/mvme68k/trap.c
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.91 2019/11/21 19:24:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.92 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -314,7 +314,10 @@ trap(struct frame *fp, int type, unsigne
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
Index: src/sys/arch/x68k/x68k/trap.c
diff -u src/sys/arch/x68k/x68k/trap.c:1.109 src/sys/arch/x68k/x68k/trap.c:1.110
--- src/sys/arch/x68k/x68k/trap.c:1.109 Thu Nov 21 19:24:02 2019
+++ src/sys/arch/x68k/x68k/trap.c Sat Sep 25 19:16:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.109 2019/11/21 19:24:02 ad Exp $ */
+/* $NetBSD: trap.c,v 1.110 2021/09/25 19:16:31 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.109 2019/11/21 19:24:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.110 2021/09/25 19:16:31 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -306,7 +306,10 @@ trap(struct frame *fp, int type, unsigne
printf("trap during panic!\n");
#ifdef DEBUG
/* XXX should be a machine-dependent hook */
- printf("(press a key)\n"); (void)cngetc();
+ printf("(press a key)\n");
+ cnpollc(1);
+ (void)cngetc();
+ cnpollc(0);
#endif
}
regdump((struct trapframe *)fp, 128);
