[src/trunk]: src/sys/arch adjust for wsfont_find() change

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb910c04ab24
branches:  trunk
changeset: 772689:eb910c04ab24
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 11 21:17:33 2012 +0000

description:
adjust for wsfont_find() change

diffstat:

 sys/arch/dreamcast/dev/pvr.c        |   8 ++++----
 sys/arch/ews4800mips/sbd/fb_sbdio.c |   8 ++++----
 sys/arch/pmax/ibus/pm.c             |  10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diffs (96 lines):

diff -r 9bdc23a2e943 -r eb910c04ab24 sys/arch/dreamcast/dev/pvr.c
--- a/sys/arch/dreamcast/dev/pvr.c      Wed Jan 11 21:12:36 2012 +0000
+++ b/sys/arch/dreamcast/dev/pvr.c      Wed Jan 11 21:17:33 2012 +0000
@@ -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 @@
        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;
diff -r 9bdc23a2e943 -r eb910c04ab24 sys/arch/ews4800mips/sbd/fb_sbdio.c
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c       Wed Jan 11 21:12:36 2012 +0000
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c       Wed Jan 11 21:17:33 2012 +0000
@@ -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 @@
 
        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;
diff -r 9bdc23a2e943 -r eb910c04ab24 sys/arch/pmax/ibus/pm.c
--- a/sys/arch/pmax/ibus/pm.c   Wed Jan 11 21:12:36 2012 +0000
+++ b/sys/arch/pmax/ibus/pm.c   Wed Jan 11 21:17:33 2012 +0000
@@ -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 @@
        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;