Module Name: src
Committed By: macallan
Date: Wed Jan 11 21:17:33 UTC 2012
Modified Files:
src/sys/arch/dreamcast/dev: pvr.c
src/sys/arch/ews4800mips/sbd: fb_sbdio.c
src/sys/arch/pmax/ibus: pm.c
Log Message:
adjust for wsfont_find() change
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/ibus/pm.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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.33 src/sys/arch/dreamcast/dev/pvr.c:1.34
--- src/sys/arch/dreamcast/dev/pvr.c:1.33 Tue Jul 19 15:52:29 2011
+++ src/sys/arch/dreamcast/dev/pvr.c Wed Jan 11 21:17:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $ */
+/* $NetBSD: pvr.c,v 1.34 2012/01/11 21:17:33 macallan Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.34 2012/01/11 21:17:33 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,10 +237,10 @@ pvr_getdevconfig(struct fb_devconfig *dc
wsfont_init();
/* prefer 8 pixel wide font */
cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie <= 0)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie <= 0) {
printf("pvr: font table is empty\n");
return;
Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.11 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.12
--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.11 Sat May 15 16:35:37 2010
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Wed Jan 11 21:17:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_sbdio.c,v 1.11 2010/05/15 16:35:37 tsutsui Exp $ */
+/* $NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define WIRED_FB_TLB
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.11 2010/05/15 16:35:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,9 +214,9 @@ fb_common_init(struct rasops_info *ri, s
wsfont_init();
/* prefer 12 pixel wide font */
- cookie = wsfont_find(NULL, 12, 0, 0, 0, 0);
+ cookie = wsfont_find(NULL, 12, 0, 0, 0, 0, WSFONT_FIND_BITMAP);
if (cookie <= 0)
- cookie = wsfont_find(NULL, 0, 0, 0, 0, 0);
+ cookie = wsfont_find(NULL, 0, 0, 0, 0, 0, WSFONT_FIND_BITMAP);
if (cookie <= 0) {
printf("sfb: font table is empty\n");
return;
Index: src/sys/arch/pmax/ibus/pm.c
diff -u src/sys/arch/pmax/ibus/pm.c:1.10 src/sys/arch/pmax/ibus/pm.c:1.11
--- src/sys/arch/pmax/ibus/pm.c:1.10 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/ibus/pm.c Wed Jan 11 21:17:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -266,13 +266,13 @@ pm_common_init(void)
wsfont_init();
if (ri->ri_depth == 8)
cookie = wsfont_find(NULL, 12, 0, 0, bior,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
else
cookie = wsfont_find(NULL, 8, 0, 0, bior,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie <= 0)
cookie = wsfont_find(NULL, 0, 0, 0, bior,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie <= 0) {
printf("pm: font table is empty\n");
return;
