[src/trunk]: src/sys/arch/shark/shark Fall back to comconsole when vga or pcc...

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

details:   https://anonhg.NetBSD.org/src/rev/4366b7868a3a
branches:  trunk
changeset: 574400:4366b7868a3a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Feb 27 18:29:43 2005 +0000

description:
Fall back to comconsole when vga or pccons console cnprobe/cnattach fails
even if options COMCONSOLE is not specified.

diffstat:

 sys/arch/shark/shark/consinit.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r f4f6ea1620b6 -r 4366b7868a3a sys/arch/shark/shark/consinit.c
--- a/sys/arch/shark/shark/consinit.c   Sun Feb 27 18:25:02 2005 +0000
+++ b/sys/arch/shark/shark/consinit.c   Sun Feb 27 18:29:43 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.1 2005/01/09 15:39:59 tsutsui Exp $     */
+/*     $NetBSD: consinit.c,v 1.2 2005/02/27 18:29:43 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1998
@@ -110,14 +110,7 @@
        initted = 1;
        cp = NULL;
 
-       if (comconsole) {
-#if (NCOM > 0)
-               if (comcnattach(&isa_io_bs_tag, CONADDR, CONSPEED, COM_FREQ,
-                   COM_TYPE_NORMAL, comcnmode))
-                       panic("can't init serial console");
-               return;
-#endif
-       } else {
+       if (!comconsole) {
 #if (NPC > 0) || (NVGA > 0)
 #if (NVGA_OFBUS > 0)
                if (!vga_ofbus_cnattach(&isa_io_bs_tag, &isa_mem_bs_tag)) {
@@ -149,4 +142,9 @@
 #endif /* NOFCONS */
 #endif /* NPC || NVGA */
        }
+#if (NCOM > 0)
+       if (comcnattach(&isa_io_bs_tag, CONADDR, CONSPEED, COM_FREQ,
+           COM_TYPE_NORMAL, comcnmode))
+               panic("can't init serial console");
+#endif
 }