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

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

details:   https://anonhg.NetBSD.org/src/rev/493266bd4fe0
branches:  trunk
changeset: 772691:493266bd4fe0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 11 21:23:38 2012 +0000

description:
adjust for wsfont_find() change

diffstat:

 sys/arch/sgimips/gio/grtwo.c   |   6 +++---
 sys/arch/sgimips/gio/light.c   |   6 +++---
 sys/arch/sgimips/gio/newport.c |   6 +++---
 sys/arch/vax/vsa/smg.c         |  12 ++++++------
 sys/arch/vax/vsa/spx.c         |  17 ++++++++++-------
 5 files changed, 25 insertions(+), 22 deletions(-)

diffs (164 lines):

diff -r 78cf66ae1d01 -r 493266bd4fe0 sys/arch/sgimips/gio/grtwo.c
--- a/sys/arch/sgimips/gio/grtwo.c      Wed Jan 11 21:23:07 2012 +0000
+++ b/sys/arch/sgimips/gio/grtwo.c      Wed Jan 11 21:23:38 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $    */
+/* $NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $   */
 
 /*
  * Copyright (c) 2004 Christopher SEKIYA
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -476,7 +476,7 @@
        wsfont_init();
 
        dc->dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R,
-                                 WSDISPLAY_FONTORDER_L2R);
+                                 WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 
        if (dc->dc_font < 0)
                panic("grtwo_attach_common: no suitable fonts");
diff -r 78cf66ae1d01 -r 493266bd4fe0 sys/arch/sgimips/gio/light.c
--- a/sys/arch/sgimips/gio/light.c      Wed Jan 11 21:23:07 2012 +0000
+++ b/sys/arch/sgimips/gio/light.c      Wed Jan 11 21:23:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $Id: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $   */
+/*     $Id: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $   */
 
 /*
  * Copyright (c) 2006 Stephen M. Rumble
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -297,7 +297,7 @@
        wsfont_init();
 
        dc->dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R,
-           WSDISPLAY_FONTORDER_L2R);
+           WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 
        if (dc->dc_font < 0)
                panic("light_attach_common: no suitable fonts");
diff -r 78cf66ae1d01 -r 493266bd4fe0 sys/arch/sgimips/gio/newport.c
--- a/sys/arch/sgimips/gio/newport.c    Wed Jan 11 21:23:07 2012 +0000
+++ b/sys/arch/sgimips/gio/newport.c    Wed Jan 11 21:23:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $    */
+/*     $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $    */
 
 /*
  * Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -536,7 +536,7 @@
        wsfont_init();
 
        dc->dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R,
-           WSDISPLAY_FONTORDER_L2R);
+           WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (dc->dc_font < 0)
                panic("newport_attach_common: no suitable fonts");
 
diff -r 78cf66ae1d01 -r 493266bd4fe0 sys/arch/vax/vsa/smg.c
--- a/sys/arch/vax/vsa/smg.c    Wed Jan 11 21:23:07 2012 +0000
+++ b/sys/arch/vax/vsa/smg.c    Wed Jan 11 21:23:38 2012 +0000
@@ -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 @@
        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 @@
        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;
diff -r 78cf66ae1d01 -r 493266bd4fe0 sys/arch/vax/vsa/spx.c
--- a/sys/arch/vax/vsa/spx.c    Wed Jan 11 21:23:07 2012 +0000
+++ b/sys/arch/vax/vsa/spx.c    Wed Jan 11 21:23:38 2012 +0000
@@ -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 @@
        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");