Module Name: src
Committed By: mlelstv
Date: Sun Dec 18 12:02:37 UTC 2016
Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: console.c
Log Message:
check for serial console flag also when re-using console from
primary bootstrap.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amiga/stand/bootblock/boot/console.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/amiga/stand/bootblock/boot/console.c
diff -u src/sys/arch/amiga/stand/bootblock/boot/console.c:1.14 src/sys/arch/amiga/stand/bootblock/boot/console.c:1.15
--- src/sys/arch/amiga/stand/bootblock/boot/console.c:1.14 Fri Jan 15 08:27:04 2016
+++ src/sys/arch/amiga/stand/bootblock/boot/console.c Sun Dec 18 12:02:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.14 2016/01/15 08:27:04 mlelstv Exp $ */
+/* $NetBSD: console.c,v 1.15 2016/12/18 12:02:37 mlelstv Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -110,8 +110,8 @@ consinit(void *consptr) {
if (consptr != NULL) {
/* Check magic? */
- ConsoleBase = consptr; /* Use existing console */
- return (0);
+ mc = consptr; /* Use existing console */
+ goto done;
}
mc = &myConsole;
@@ -148,6 +148,8 @@ consinit(void *consptr) {
if (OpenDevice("timer.device", 0, (struct AmigaIO*)mc->tmior, 0))
goto err;
+done:
+
#ifdef SERCONSOLE
conspreinit();
if (use_serconsole)
