summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>1999-04-01 11:52:42 +0000
committerdrochner <drochner@NetBSD.org>1999-04-01 11:52:42 +0000
commit00a4d0521a26880af1c77b1f468e1544f8133eec (patch)
tree4c28394d57fbaacf198453f247e0704ef6bcb758 /sys/dev
parent4f0acde07b9d64ef1bdf495a875aa6d4a15c66b6 (diff)
use defopted WSCONS_SUPPORT_PCVTFONTS, refuse to load pcvt fonts if this
option is not given, suppress complaints in non-debug case
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/vga.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 566e944ba52..b373ecc7701 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.15 1999/03/22 18:24:23 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.16 1999/04/01 11:52:42 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -49,6 +49,8 @@
#include <dev/ic/pcdisplay.h>
+#include "opt_wsdisplay_compat.h" /* for WSCONS_SUPPORT_PCVTFONTS */
+
static struct vgafont {
char name[16];
int height;
@@ -762,6 +764,12 @@ vga_load_font(v, cookie, data)
return (EINVAL); /* XXX 1 byte per line */
if (data->firstchar != 0 || data->numchars != 256)
return (EINVAL);
+#ifndef WSCONS_SUPPORT_PCVTFONTS
+ if (data->encoding == WSDISPLAY_FONTENC_PCVT) {
+ printf("vga: pcvt font support not built in, see vga(4)\n");
+ return (EINVAL);
+ }
+#endif
for (slot = 0; slot < 8; slot++)
if (!vc->vc_fonts[slot])
@@ -1030,7 +1038,9 @@ _vga_mapchar(id, font, uni, index)
return (vga_pcvt_mapchar(uni, index));
#endif
default:
+#ifdef VGAFONTDEBUG
printf("_vga_mapchar: encoding=%d\n", font->encoding);
+#endif
*index = ' ';
return (0);
}