summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2001-07-29 23:13:29 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2001-07-29 23:13:29 +0000
commit785c5c7be2f4feac5445bf3d341bfe7cd5a4fbdd (patch)
tree50a32dbdf92d31ba95cbd4075a218a0438d5fcca /sys
parent589aee2811dab0bb5196c37ef7ba2de6a497be8a (diff)
Temporarily fix wscninit so that it only runs once.
Somebody should fix the boot-up logic so it's only called once
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/wscons_machdep.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 7dfcd9ed95e..91f2163882f 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.6 2001/07/26 07:09:12 csapuntz Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.7 2001/07/29 23:13:28 csapuntz Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -116,6 +116,13 @@ void
wscninit(cp)
struct consdev *cp;
{
+ static int initted;
+
+ if (initted)
+ return;
+
+ initted = 1;
+
#if (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0)
#if (NVGA > 0)
if (!vga_cnattach(I386_BUS_SPACE_IO, I386_BUS_SPACE_MEM, -1, 1))