Module Name: src
Committed By: macallan
Date: Wed Jan 11 21:26:13 UTC 2012
Modified Files:
src/sys/arch/vax/vsa: smg.c spx.c
Log Message:
adjust for wsfont_find() change
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vsa/spx.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/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.54 src/sys/arch/vax/vsa/smg.c:1.55
--- src/sys/arch/vax/vsa/smg.c:1.54 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/smg.c Wed Jan 11 21:26:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -247,8 +247,8 @@ smg_attach(device_t parent, device_t sel
callout_reset(&smg_cursor_ch, hz / 2, smg_crsr_blink, NULL);
curcmd = CUR_CMD_HSHI;
WRITECUR(CUR_CMD, curcmd);
- if ((fcookie = wsfont_find(NULL, 8, 15, 0,
- WSDISPLAY_FONTORDER_R2L, WSDISPLAY_FONTORDER_L2R)) < 0) {
+ if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0) {
aprint_error_dev(self, "could not find 8x15 font\n");
return;
}
@@ -595,8 +595,8 @@ smgcninit(struct consdev *cndev)
curscr = &smg_conscreen;
wsdisplay_cnattach(&smg_stdscreen, &smg_conscreen, 0, 0, 0);
cn_tab->cn_pri = CN_INTERNAL;
- if ((fcookie = wsfont_find(NULL, 8, 15, 0,
- WSDISPLAY_FONTORDER_R2L, WSDISPLAY_FONTORDER_L2R)) < 0)
+ if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0)
{
printf("smg: could not find 8x15 font\n");
return;
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.4 src/sys/arch/vax/vsa/spx.c:1.5
--- src/sys/arch/vax/vsa/spx.c:1.4 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/spx.c Wed Jan 11 21:26:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1477,16 +1477,19 @@ spx_init_common(device_t self, struct vs
wsfont_init();
cookie = wsfont_find(NULL, 12, 21, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 16, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 16, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, &wf))
panic("spx_common_init: unable to load console font");
