summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-18 17:02:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-18 17:02:27 +0000
commit9f47eedfae033ee1423044397396bd0d13711d4f (patch)
treef2e5e3b4b6cf5b38ad06e833149c20147b976ea1 /sys/arch
parent02ef75437b52173903c3ba96766eeb81e36ea256 (diff)
fix fb_setsize() to set width/height for P4 frame buffers
now rconsole works on all P4 frame buffers
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/dev/bwtwo.c3
-rw-r--r--sys/arch/sparc/dev/cgfour.c3
-rw-r--r--sys/arch/sparc/dev/fb.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index e743a1e5428..b024a82640a 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -265,8 +265,7 @@ bwtwoattach(parent, self, args)
if (isconsole) {
printf(" (console)\n");
#ifdef RASTERCONSOLE
- if (ca->ca_bustype != BUS_PFOUR)
- fbrcons_init(&sc->sc_fb);
+ fbrcons_init(&sc->sc_fb);
#endif
} else
printf("\n");
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index 96b604662b3..ebd6b1fecd7 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -199,6 +199,9 @@ cgfourattach(parent, self, args)
if (isconsole) {
printf(" (console)\n");
+#ifdef RASTERCONSOLE
+ fbrcons_init(&sc->sc_fb);
+#endif
} else
printf("\n");
if ((node == fbnode && cputyp != CPU_SUN4) ||
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c
index f61b94560bb..ade9db9dbe6 100644
--- a/sys/arch/sparc/dev/fb.c
+++ b/sys/arch/sparc/dev/fb.c
@@ -139,6 +139,8 @@ fb_setsize(fb, depth, def_width, def_height, node, bustype)
*/
switch (bustype) {
case BUS_PFOUR:
+ fb->fb_type.fb_width = def_width;
+ fb->fb_type.fb_height = def_height;
fb->fb_linebytes = (fb->fb_type.fb_width * depth) / 8;
break;
case BUS_VME16: