[src/trunk]: src/sys/dev/ic use defopted WSCONS_SUPPORT_PCVTFONTS, refuse to ...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad6d5239fa68
branches:  trunk
changeset: 467990:ad6d5239fa68
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Apr 01 11:52:42 1999 +0000

description:
use defopted WSCONS_SUPPORT_PCVTFONTS, refuse to load pcvt fonts if this
option is not given, suppress complaints in non-debug case

diffstat:

 sys/dev/ic/vga.c |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r c1f0acddfed0 -r ad6d5239fa68 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Thu Apr 01 11:50:02 1999 +0000
+++ b/sys/dev/ic/vga.c  Thu Apr 01 11:52:42 1999 +0000
@@ -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 @@
                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 @@
                return (vga_pcvt_mapchar(uni, index));
 #endif
        default:
+#ifdef VGAFONTDEBUG
                printf("_vga_mapchar: encoding=%d\n", font->encoding);
+#endif
                *index = ' ';
                return (0);
        }