From 2fe4478f1989622dfd2da2b362ad2f0a15c14dd3 Mon Sep 17 00:00:00 2001
From: tsubai <tsubai@NetBSD.org>
Date: Thu, 2 Nov 2000 14:25:51 +0000
Subject: [PATCH] Don't assume 12x22 font.

---
 sys/arch/macppc/dev/ofb.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/arch/macppc/dev/ofb.c b/sys/arch/macppc/dev/ofb.c
index 7d113c6b688c..ff853b543196 100644
--- a/sys/arch/macppc/dev/ofb.c
+++ b/sys/arch/macppc/dev/ofb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofb.c,v 1.16 2000/10/01 19:08:30 tsubai Exp $	*/
+/*	$NetBSD: ofb.c,v 1.17 2000/11/02 14:25:51 tsubai Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -258,8 +258,11 @@ ofb_common_init(node, dc)
 		ri->ri_yorigin = 3;
 		ri->ri_bits = (char *)addr + ri->ri_xorigin +
 			      ri->ri_stride * ri->ri_yorigin;
-	} else
-		rasops_init(ri, height/22, (width/12) & ~7);	/* XXX 12x22 */
+	} else {
+		rasops_init(ri, 24, 80);
+		rasops_reconfig(ri, (height - 2) / ri->ri_font->fontheight,
+		    ((width - 2) / ri->ri_font->fontwidth) & ~7);
+	}
 
 	/* black on white */
 	ri->ri_devcmap[0] = 0xffffffff;			/* bg */