Module Name: src
Committed By: macallan
Date: Wed Jan 11 21:12:37 UTC 2012
Modified Files:
src/sys/dev/tc: cfb.c mfb.c sfb.c sfbplus.c stic.c tfb.c xcfb.c
Log Message:
adjust wsfont_find()
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/tc/stic.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/tc/xcfb.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/dev/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.60 src/sys/dev/tc/cfb.c:1.61
--- src/sys/dev/tc/cfb.c:1.60 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/cfb.c Wed Jan 11 21:12:36 2012
@@ -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 @@ cfb_common_init(struct rasops_info *ri)
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;
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.60 src/sys/dev/tc/tfb.c:1.61
--- src/sys/dev/tc/tfb.c:1.60 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/tfb.c Wed Jan 11 21:12:36 2012
@@ -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 @@ tfb_common_init(struct rasops_info *ri)
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;
Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.57 src/sys/dev/tc/mfb.c:1.58
--- src/sys/dev/tc/mfb.c:1.57 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/mfb.c Wed Jan 11 21:12:36 2012
@@ -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 @@ mfb_common_init(struct rasops_info *ri)
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;
Index: src/sys/dev/tc/sfb.c
diff -u src/sys/dev/tc/sfb.c:1.83 src/sys/dev/tc/sfb.c:1.84
--- src/sys/dev/tc/sfb.c:1.83 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/sfb.c Wed Jan 11 21:12:36 2012
@@ -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 @@ sfb_common_init(struct rasops_info *ri)
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;
Index: src/sys/dev/tc/sfbplus.c
diff -u src/sys/dev/tc/sfbplus.c:1.36 src/sys/dev/tc/sfbplus.c:1.37
--- src/sys/dev/tc/sfbplus.c:1.36 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/sfbplus.c Wed Jan 11 21:12:36 2012
@@ -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 @@ sfbp_common_init(struct rasops_info *ri)
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;
Index: src/sys/dev/tc/stic.c
diff -u src/sys/dev/tc/stic.c:1.48 src/sys/dev/tc/stic.c:1.49
--- src/sys/dev/tc/stic.c:1.48 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/stic.c Wed Jan 11 21:12:36 2012
@@ -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 @@ stic_init(struct stic_info *si)
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");
Index: src/sys/dev/tc/xcfb.c
diff -u src/sys/dev/tc/xcfb.c:1.54 src/sys/dev/tc/xcfb.c:1.55
--- src/sys/dev/tc/xcfb.c:1.54 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/xcfb.c Wed Jan 11 21:12:37 2012
@@ -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 @@ xcfb_common_init(struct rasops_info *ri)
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;
