From cadfd97e07e5bd3ac97c68bf5dc5285ed8d033b5 Mon Sep 17 00:00:00 2001 From: enami Date: Fri, 7 Jan 2000 02:57:17 +0000 Subject: Replace WSFONT_L2R/R2L with WSDISPLAY_FONTORDER_L2R/R2L. --- sys/dev/tc/sfb.c | 6 +++--- sys/dev/wsfont/wsfont.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c index fb5c94abd27..334d69405b2 100644 --- a/sys/dev/tc/sfb.c +++ b/sys/dev/tc/sfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfb.c,v 1.32 1999/12/16 15:07:00 ad Exp $ */ +/* $NetBSD: sfb.c,v 1.33 2000/01/07 02:57:17 enami Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -32,7 +32,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.32 1999/12/16 15:07:00 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.33 2000/01/07 02:57:17 enami Exp $"); #include #include @@ -321,7 +321,7 @@ sfb_getdevconfig(dense_addr, dc) /* the accelerated sfb_putchar() needs LSbit left */ if (wsfont_lock(cookie, &dc->rinfo.ri_font, - WSFONT_R2L, WSFONT_L2R) <= 0) { + WSDISPLAY_FONTORDER_R2L, WSDISPLAY_FONTORDER_L2R) <= 0) { printf("sfb: couldn't lock font\n"); return; } diff --git a/sys/dev/wsfont/wsfont.h b/sys/dev/wsfont/wsfont.h index 08acdcba39d..c258bb172ad 100644 --- a/sys/dev/wsfont/wsfont.h +++ b/sys/dev/wsfont/wsfont.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsfont.h,v 1.10 2000/01/05 18:44:26 ad Exp $ */ +/* $NetBSD: wsfont.h,v 1.11 2000/01/07 02:57:18 enami Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -55,7 +55,8 @@ * if ((cookie = wsfont_find(NULL, 8, 16, 0, 0)) <= 0) * panic("unable to get 8x16 font"); * - * if (wsfont_lock(cookie, &font, WSFONT_L2R, WSFONT_R2L) <= 0) + * if (wsfont_lock(cookie, &font, WSDISPLAY_FONTORDER_L2R, + * WSDISPLAY_FONTORDER_R2L) <= 0) * panic("unable to lock font"); * * ... do stuff ... -- cgit