[src/trunk]: src/sys/arch/amiga/stand/bootblock/boot check for serial console...

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

details:   https://anonhg.NetBSD.org/src/rev/93ad51c721e2
branches:  trunk
changeset: 349669:93ad51c721e2
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Dec 18 12:02:37 2016 +0000

description:
check for serial console flag also when re-using console from
primary bootstrap.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/console.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r b9f18ead3652 -r 93ad51c721e2 sys/arch/amiga/stand/bootblock/boot/console.c
--- a/sys/arch/amiga/stand/bootblock/boot/console.c     Sun Dec 18 06:56:43 2016 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/console.c     Sun Dec 18 12:02:37 2016 +0000
@@ -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 @@
 
        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 @@
        if (OpenDevice("timer.device", 0, (struct AmigaIO*)mc->tmior, 0))
                goto err;
 
+done:
+
 #ifdef SERCONSOLE
        conspreinit();
        if (use_serconsole)