Fix botch in previous.

This commit is contained in:
ad 2002-03-13 23:17:18 +00:00
parent d26d3b351c
commit 5d95c4499b
1 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: vga.c,v 1.47 2002/03/13 15:05:15 ad Exp $ */
/* $NetBSD: vga.c,v 1.48 2002/03/13 23:17:18 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.47 2002/03/13 15:05:15 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.48 2002/03/13 23:17:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -349,8 +349,7 @@ egavga_getfont(struct vga_config *vc, struct vgascreen *scr, char *name,
TAILQ_FOREACH(f, &vc->vc_fontlist, next) {
if (wsfont_matches(f->wsfont, name,
8, scr->pcs.type->fontheight, 0,
WSDISPLAY_FONTORDER_L2R, 0) &&
8, scr->pcs.type->fontheight, 0) &&
(!primary || vga_valid_primary_font(f))) {
#ifdef VGAFONTDEBUG
if (scr != &vga_console_screen || vga_console_attached)
@ -361,7 +360,8 @@ egavga_getfont(struct vga_config *vc, struct vgascreen *scr, char *name,
}
}
cookie = wsfont_find(name, 8, scr->pcs.type->fontheight, 0);
cookie = wsfont_find(name, 8, scr->pcs.type->fontheight, 0,
WSDISPLAY_FONTORDER_L2R, 0);
/* XXX obey "primary" */
if (cookie == -1) {
#ifdef VGAFONTDEBUG