[src/trunk]: src/sys/dev/ic more cleanups from Julio Merino.

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

details:   https://anonhg.NetBSD.org/src/rev/526ad0d9e0d4
branches:  trunk
changeset: 533466:526ad0d9e0d4
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jul 01 13:17:48 2002 +0000

description:
more cleanups from Julio Merino.

diffstat:

 sys/dev/ic/pcdisplay_subr.c |   8 ++++++--
 sys/dev/ic/vga.c            |  16 +++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diffs (106 lines):

diff -r 4ce5d02e3844 -r 526ad0d9e0d4 sys/dev/ic/pcdisplay_subr.c
--- a/sys/dev/ic/pcdisplay_subr.c       Mon Jul 01 07:42:49 2002 +0000
+++ b/sys/dev/ic/pcdisplay_subr.c       Mon Jul 01 13:17:48 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.21 2002/06/26 23:05:33 christos Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.22 2002/07/01 13:17:48 christos Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.21 2002/06/26 23:05:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.22 2002/07/01 13:17:48 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,8 @@
 
 #include <dev/wscons/wsdisplayvar.h>
 
+#include "opt_wsdisplay_compat.h" /* for WSDISPLAY_CHARFUNCS */
+
 void
 pcdisplay_cursor_init(scr, existing)
        struct pcdisplayscreen *scr;
@@ -274,6 +276,7 @@
                        scr->mem[off + i] = val;
 }
 
+#ifdef WSDISPLAY_CHARFUNCS
 int
 pcdisplay_getwschar(id, wschar)
        void *id;
@@ -338,3 +341,4 @@
 
        return 0;
 }
+#endif /* WSDISPLAY_CHARFUNCS */
diff -r 4ce5d02e3844 -r 526ad0d9e0d4 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Mon Jul 01 07:42:49 2002 +0000
+++ b/sys/dev/ic/vga.c  Mon Jul 01 13:17:48 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.56 2002/06/28 22:24:11 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.57 2002/07/01 13:17:48 christos Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.56 2002/06/28 22:24:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.57 2002/07/01 13:17:48 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,8 @@
 
 #include <dev/ic/pcdisplay.h>
 
-#include "opt_wsdisplay_compat.h" /* for WSCONS_SUPPORT_PCVTFONTS */
+/* for WSCONS_SUPPORT_PCVTFONTS and WSDISPLAY_CHARFUNCS */
+#include "opt_wsdisplay_compat.h"
 #include "opt_vga.h"
 
 static struct wsdisplay_font _vga_builtinfont = {
@@ -248,8 +249,10 @@
 static int     vga_show_screen(void *, void *, int,
                                void (*)(void *, int, int), void *);
 static int     vga_load_font(void *, void *, struct wsdisplay_font *);
+#ifdef WSDISPLAY_CHARFUNCS
 static int     vga_getwschar(void *, struct wsdisplay_char *);
 static int     vga_putwschar(void *, struct wsdisplay_char *);
+#endif /* WSDISPLAY_CHARFUNCS */
 
 void vga_doswitch(struct vga_config *);
 
@@ -261,8 +264,13 @@
        vga_show_screen,
        vga_load_font,
        NULL,
+#ifdef WSDISPLAY_CHARFUNCS
        vga_getwschar,
        vga_putwschar
+#else /* WSDISPLAY_CHARFUNCS */
+       NULL,
+       NULL
+#endif /* WSDISPLAY_CHARFUNCS */
 };
 
 /*
@@ -1324,6 +1332,7 @@
        return (res1);
 }
 
+#ifdef WSDISPLAY_CHARFUNCS
 int
 vga_getwschar(void *cookie, struct wsdisplay_char *wschar)
 {
@@ -1341,3 +1350,4 @@
        if (scr == NULL) return 0;
        return (pcdisplay_putwschar(&scr->pcs, wschar));
 }
+#endif /* WSDISPLAY_CHARFUNCS */