Module Name: src
Committed By: macallan
Date: Wed Jan 11 21:23:38 UTC 2012
Modified Files:
src/sys/arch/sgimips/gio: grtwo.c light.c newport.c
Log Message:
adjust for wsfont_find() change
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/gio/grtwo.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/light.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/grtwo.c
diff -u src/sys/arch/sgimips/gio/grtwo.c:1.11 src/sys/arch/sgimips/gio/grtwo.c:1.12
--- src/sys/arch/sgimips/gio/grtwo.c:1.11 Sun Nov 22 19:09:15 2009
+++ src/sys/arch/sgimips/gio/grtwo.c Wed Jan 11 21:23:38 2012
@@ -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 @@ grtwo_attach_common(struct grtwo_devconf
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");
Index: src/sys/arch/sgimips/gio/light.c
diff -u src/sys/arch/sgimips/gio/light.c:1.5 src/sys/arch/sgimips/gio/light.c:1.6
--- src/sys/arch/sgimips/gio/light.c:1.5 Sun Mar 4 06:00:39 2007
+++ src/sys/arch/sgimips/gio/light.c Wed Jan 11 21:23:38 2012
@@ -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 @@ light_attach_common(struct light_devconf
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");
Index: src/sys/arch/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.16 src/sys/arch/sgimips/gio/newport.c:1.17
--- src/sys/arch/sgimips/gio/newport.c:1.16 Wed Jan 11 16:18:30 2012
+++ src/sys/arch/sgimips/gio/newport.c Wed Jan 11 21:23:38 2012
@@ -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 @@ newport_attach_common(struct newport_dev
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");
