[src/trunk]: src/sys adjust wsfont_find()

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys adjust wsfont_find()
From: macallan <macallan%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 21:57:52 +0000
details:   https://anonhg.NetBSD.org/src/rev/9bdc23a2e943
branches:  trunk
changeset: 772688:9bdc23a2e943
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 11 21:12:36 2012 +0000

description:
adjust wsfont_find()

diffstat:

 sys/arch/amiga/dev/amidisplaycc.c  |  7 ++++---
 sys/arch/arm/s3c2xx0/s3c24x0_lcd.c |  6 +++---
 sys/arch/arm/xscale/pxa2x0_lcd.c   |  7 ++++---
 sys/dev/tc/cfb.c                   |  8 ++++----
 sys/dev/tc/mfb.c                   |  8 ++++----
 sys/dev/tc/sfb.c                   |  8 ++++----
 sys/dev/tc/sfbplus.c               |  8 ++++----
 sys/dev/tc/stic.c                  |  8 ++++----
 sys/dev/tc/tfb.c                   |  8 ++++----
 sys/dev/tc/xcfb.c                  |  8 ++++----
 10 files changed, 39 insertions(+), 37 deletions(-)

diffs (300 lines):

diff -r 514ee5296d80 -r 9bdc23a2e943 sys/arch/amiga/dev/amidisplaycc.c
--- a/sys/arch/amiga/dev/amidisplaycc.c Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/arch/amiga/dev/amidisplaycc.c Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amidisplaycc.c,v 1.24 2011/12/15 14:25:13 phx Exp $ */
+/*     $NetBSD: amidisplaycc.c,v 1.25 2012/01/11 21:14:33 macallan Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.24 2011/12/15 14:25:13 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.25 2012/01/11 21:14:33 macallan Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
@@ -1836,7 +1836,8 @@
                scr->fontheight,
                1,
                WSDISPLAY_FONTORDER_L2R,
-               WSDISPLAY_FONTORDER_L2R);
+               WSDISPLAY_FONTORDER_L2R,
+               WSFONT_FIND_BITMAP);
 
        if (wsfontcookie == -1)
                return (EINVAL);
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
--- a/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c        Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c        Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.8 2012/01/11 21:15:46 macallan Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.8 2012/01/11 21:15:46 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -560,7 +560,7 @@
 
                cookie = wsfont_find(NULL, type->c.fontwidth, 
                    type->c.fontheight, 0, WSDISPLAY_FONTORDER_L2R,
-                   WSDISPLAY_FONTORDER_L2R);
+                   WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 
                if (cookie > 0) {
                        if (wsfont_lock(cookie, &scr->rinfo.ri_font))
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/arch/arm/xscale/pxa2x0_lcd.c
--- a/sys/arch/arm/xscale/pxa2x0_lcd.c  Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_lcd.c  Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.32 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.33 2012/01/11 21:15:46 macallan Exp $ */
 
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.32 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.33 2012/01/11 21:15:46 macallan Exp $");
 
 #include "opt_pxa2x0_lcd.h"
 
@@ -745,7 +745,8 @@
        if (fontname) {
                wsfont_init();
                cookie = wsfont_find(fontname, 0, 0, 0, 
-                   WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R);
+                   WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R,
+                   WSFONT_FIND_BITMAP);
                if (cookie < 0 ||
                    wsfont_lock(cookie, &rinfo.ri_font))
                        return -1;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/cfb.c
--- a/sys/dev/tc/cfb.c  Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/cfb.c  Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: cfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -332,10 +332,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 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("cfb: font table is empty\n");
                return;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/mfb.c
--- a/sys/dev/tc/mfb.c  Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/mfb.c  Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: mfb.c,v 1.58 2012/01/11 21:12:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.58 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -296,10 +296,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 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("mfb: font table is empty\n");
                return;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/sfb.c
--- a/sys/dev/tc/sfb.c  Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/sfb.c  Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: sfb.c,v 1.84 2012/01/11 21:12:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.84 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -358,10 +358,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L,
-           WSDISPLAY_FONTORDER_L2R);
+           WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0)
                cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
-                   WSDISPLAY_FONTORDER_L2R);
+                   WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0) {
                printf("sfb: font table is empty\n");
                return;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/sfbplus.c
--- a/sys/dev/tc/sfbplus.c      Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/sfbplus.c      Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.36 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: sfbplus.c,v 1.37 2012/01/11 21:12:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.36 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.37 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -392,10 +392,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L,
-           WSDISPLAY_FONTORDER_L2R);
+           WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0)
                cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
-                   WSDISPLAY_FONTORDER_L2R);
+                   WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0) {
                printf("sfbp: font table is empty\n");
                return;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/stic.c
--- a/sys/dev/tc/stic.c Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/stic.c Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stic.c,v 1.48 2010/11/13 13:52:12 uebayasi Exp $       */
+/*     $NetBSD: stic.c,v 1.49 2012/01/11 21:12:36 macallan Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.48 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.49 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -309,10 +309,10 @@
        wsfont_init();
 
        cookie = wsfont_find(NULL, 12, 0, 2, WSDISPLAY_FONTORDER_R2L,
-           WSDISPLAY_FONTORDER_L2R);
+           WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0)
                cookie = wsfont_find(NULL, 0, 0, 2, WSDISPLAY_FONTORDER_R2L,
-                   WSDISPLAY_FONTORDER_L2R);
+                   WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
        if (cookie <= 0)
                panic("stic_init: font table is empty");
 
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/tfb.c
--- a/sys/dev/tc/tfb.c  Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/tfb.c  Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: tfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -350,10 +350,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 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("tfb: font table is empty\n");
                return;
diff -r 514ee5296d80 -r 9bdc23a2e943 sys/dev/tc/xcfb.c
--- a/sys/dev/tc/xcfb.c Wed Jan 11 20:50:00 2012 +0000
+++ b/sys/dev/tc/xcfb.c Wed Jan 11 21:12:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.54 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: xcfb.c,v 1.55 2012/01/11 21:12:37 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.54 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.55 2012/01/11 21:12:37 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -293,10 +293,10 @@
        wsfont_init();
        /* prefer 12 pixel wide font */
        cookie = wsfont_find(NULL, 12, 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("xcfb: font table is empty\n");
                return;
Prev by Date: [src/trunk]: src/sys/arch adjust for wsfont_find() change
Next by Date: [src/trunk]: src/sys/arch adjust for wsfont_find() change
Previous by Thread: [src/trunk]: src/sys/arch adjust for wsfont_find() change
Next by Thread: [src/trunk]: src/sys/arch adjust for wsfont_find() change
Indexes:
Home | Main Index | Thread Index | Old Index