summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-11-29 12:13:56 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-11-29 12:13:56 +0000
commitfb2255fc8756c12ec3557ef061587f1ffdb3fcc5 (patch)
tree2979602a939896459f2502111118521c6012ac2d /sys/dev/ic
parentafe56911378491afdcb3a537d27aa1860371ba7b (diff)
Add a new member to struct wsemuldisplaydev_attach_args, for a frame buffer
driver to be able to tell how many wscons screens to attach to it, instead of WSDISPLAY_DEFAULTSCREENS which is a global setting.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/sti.c3
-rw-r--r--sys/dev/ic/vga.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 7e6afa2e8b4..500aa22e873 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sti.c,v 1.44 2006/08/22 21:04:32 miod Exp $ */
+/* $OpenBSD: sti.c,v 1.45 2006/11/29 12:13:54 miod Exp $ */
/*
* Copyright (c) 2000-2003 Michael Shalayeff
@@ -467,6 +467,7 @@ sti_end_attach(void *v)
waa.scrdata = &sti_default_screenlist;
waa.accessops = &sti_accessops;
waa.accesscookie = sc;
+ waa.defaultscreens = 0;
/* attach as console if required */
if (waa.console && !ISSET(sc->sc_flags, STI_ATTACHED)) {
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 884dddf39e9..c5489d3df46 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.39 2006/09/29 19:46:02 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.40 2006/11/29 12:13:54 miod Exp $ */
/* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
/*
@@ -532,6 +532,7 @@ vga_extended_attach(self, iot, memt, type, map)
aa.scrdata = (vc->hdl.vh_mono ? &vga_screenlist_mono : &vga_screenlist);
aa.accessops = &vga_accessops;
aa.accesscookie = vc;
+ aa.defaultscreens = 0;
config_found(self, &aa, wsemuldisplaydevprint);
}