[src/netbsd-2-0]: src/sys/dev/ic Pull up revision 1.74 (requested by recht in...

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

details:   https://anonhg.NetBSD.org/src/rev/cbc6568c9f85
branches:  netbsd-2-0
changeset: 561313:cbc6568c9f85
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 09:50:25 2004 +0000

description:
Pull up revision 1.74 (requested by recht in ticket #451):
fix another scrolling use that leaked.

diffstat:

 sys/dev/ic/vga.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r b5d3957ca540 -r cbc6568c9f85 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Mon Jun 07 09:48:52 2004 +0000
+++ b/sys/dev/ic/vga.c  Mon Jun 07 09:50:25 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.71.4.2 2004/06/07 09:47:25 tron Exp $ */
+/* $NetBSD: vga.c,v 1.71.4.3 2004/06/07 09:50:25 tron Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.71.4.2 2004/06/07 09:47:25 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.71.4.3 2004/06/07 09:50:25 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,7 +122,9 @@
 void vga_putchar(void *, int, int, u_int, long);
 static int vga_allocattr(void *, int, int, int, long *);
 static void vga_copyrows(void *, int, int, int);
+#ifdef WSDISPLAY_SCROLLSUPPORT
 void vga_scroll (void *, void *, int);
+#endif
 
 const struct wsdisplay_emulops vga_emulops = {
        pcdisplay_cursor,
@@ -1364,10 +1366,12 @@
 void
 vga_putchar(void *c, int row, int col, u_int uc, long attr)
 {
+#ifdef WSDISPLAY_SCROLLSUPPORT
        struct vgascreen *scr = c;
 
        if (scr->pcs.visibleoffset != scr->pcs.dispoffset)
                vga_scroll(scr->cfg, scr, WSDISPLAY_SCROLL_BACKWARD);
+#endif
 
        pcdisplay_putchar(c, row, col, uc, attr);
 }