Module Name: src
Committed By: macallan
Date: Wed Jan 11 20:41:28 UTC 2012
Modified Files:
src/sys/dev/ic: igsfb.c vga.c vga_raster.c
Log Message:
wsfont_matches() and wsfont_find() take an extra parameter now
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/igsfb.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/vga_raster.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/igsfb.c
diff -u src/sys/dev/ic/igsfb.c:1.51 src/sys/dev/ic/igsfb.c:1.52
--- src/sys/dev/ic/igsfb.c:1.51 Wed Jan 11 16:12:38 2012
+++ src/sys/dev/ic/igsfb.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $ */
+/* $NetBSD: igsfb.c,v 1.52 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.52 2012/01/11 20:41:28 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -432,14 +432,15 @@ igsfb_init_wsdisplay(void *cookie, struc
/* prefer gallant that is identical to the one the prom uses */
wsfcookie = wsfont_find("Gallant", 12, 22, 0,
WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (wsfcookie <= 0) {
#ifdef DIAGNOSTIC
printf("unable to find font Gallant 12x22\n");
#endif
wsfcookie = wsfont_find(NULL, 0, 0, 0, /* any font at all? */
WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R,
+ WSFONT_FIND_BITMAP);
}
if (wsfcookie <= 0) {
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.107 src/sys/dev/ic/vga.c:1.108
--- src/sys/dev/ic/vga.c:1.107 Wed Jun 8 10:25:21 2011
+++ src/sys/dev/ic/vga.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $");
/* for WSCONS_SUPPORT_PCVTFONTS */
#include "opt_wsdisplay_compat.h"
@@ -325,7 +325,7 @@ egavga_getfont(struct vga_config *vc, st
TAILQ_FOREACH(f, &vc->vc_fontlist, next) {
if (wsfont_matches(f->wsfont, name,
- 8, scr->pcs.type->fontheight, 0) &&
+ 8, scr->pcs.type->fontheight, 0, WSFONT_FIND_BITMAP) &&
(!primary || vga_valid_primary_font(f))) {
#ifdef VGAFONTDEBUG
if (scr != &vga_console_screen || vga_console_attached)
@@ -337,7 +337,7 @@ egavga_getfont(struct vga_config *vc, st
}
cookie = wsfont_find(name, 8, scr->pcs.type->fontheight, 0,
- WSDISPLAY_FONTORDER_L2R, 0);
+ WSDISPLAY_FONTORDER_L2R, 0, WSFONT_FIND_BITMAP);
/* XXX obey "primary" */
if (cookie == -1) {
#ifdef VGAFONTDEBUG
@@ -570,7 +570,7 @@ vga_init(struct vga_config *vc, bus_spac
int cookie;
cookie = wsfont_find(NULL, 8, 16, 0,
- WSDISPLAY_FONTORDER_L2R, 0);
+ WSDISPLAY_FONTORDER_L2R, 0, WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, &wf))
panic("vga_init: can't load console font");
vga_loadchars(&vc->hdl, 0, wf->firstchar, wf->numchars,
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.34 src/sys/dev/ic/vga_raster.c:1.35
--- src/sys/dev/ic/vga_raster.c:1.34 Wed Mar 24 19:33:51 2010
+++ src/sys/dev/ic/vga_raster.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $ */
+/* $NetBSD: vga_raster.c,v 1.35 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.35 2012/01/11 20:41:28 macallan Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -424,10 +424,11 @@ vga_raster_init(struct vga_config *vc, b
/* prefer 8x16 pixel font */
cookie = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R,
- 0);
+ 0, WSFONT_FIND_BITMAP);
if (cookie == -1)
cookie = wsfont_find(NULL, 0, 0, 0,
- WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R,
+ WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, &wf))
panic("vga_raster_init: can't load console font");
vf->font = wf;
@@ -836,7 +837,8 @@ vga_raster_setup_font(struct vga_config
int cookie;
LIST_FOREACH(vf, &vc->vc_fontlist, next) {
- if (wsfont_matches(vf->font, 0, 0, scr->type->fontheight, 0)) {
+ if (wsfont_matches(vf->font, 0, 0, scr->type->fontheight, 0,
+ WSFONT_FIND_BITMAP)) {
scr->encoding = vf->font->encoding;
LIST_INSERT_HEAD(&scr->fontset, vf, next);
return;
@@ -844,7 +846,7 @@ vga_raster_setup_font(struct vga_config
}
cookie = wsfont_find(NULL, 0, scr->type->fontheight, 0,
- WSDISPLAY_FONTORDER_L2R, 0);
+ WSDISPLAY_FONTORDER_L2R, 0, WSFONT_FIND_BITMAP);
if (cookie == -1)
return;
