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

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

details:   https://anonhg.NetBSD.org/src/rev/80f2d5dda7df
branches:  netbsd-2-0
changeset: 561300:80f2d5dda7df
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 09:37:44 2004 +0000

description:
Pull up revision 1.26 (requested by recht in ticket #451):
PR/19925: David Ferlier: Add scrolling support to wscons.

diffstat:

 sys/dev/ic/pcdisplay_subr.c   |   6 ++++--
 sys/dev/wscons/wsdisplayvar.h |  12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r 9156ac46bf50 -r 80f2d5dda7df sys/dev/ic/pcdisplay_subr.c
--- a/sys/dev/ic/pcdisplay_subr.c       Mon Jun 07 09:37:38 2004 +0000
+++ b/sys/dev/ic/pcdisplay_subr.c       Mon Jun 07 09:37:44 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.25 2002/08/25 19:11:16 thorpej Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.25.8.1 2004/06/07 09:37:44 tron 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.25 2002/08/25 19:11:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.25.8.1 2004/06/07 09:37:44 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -176,6 +176,8 @@
                                  c | (attr << 8));
        else
                scr->mem[off] = c | (attr << 8);
+
+       scr->visibleoffset = scr->dispoffset;
 }
 
 void
diff -r 9156ac46bf50 -r 80f2d5dda7df sys/dev/wscons/wsdisplayvar.h
--- a/sys/dev/wscons/wsdisplayvar.h     Mon Jun 07 09:37:38 2004 +0000
+++ b/sys/dev/wscons/wsdisplayvar.h     Mon Jun 07 09:37:44 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.25 2003/06/29 22:31:03 fvdl Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.25.4.1 2004/06/07 09:37:44 tron Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -108,6 +108,7 @@
        int     (*show_screen)(void *, void *, int,
                                    void (*) (void *, int, int), void *);
        int     (*load_font)(void *, void *, struct wsdisplay_font *);
+       void    (*scroll) __P((void *, void *, int));
        void    (*pollc)(void *, int);
        int     (*getwschar)(void *, struct wsdisplay_char *);
        int     (*putwschar)(void *, struct wsdisplay_char *);
@@ -196,6 +197,15 @@
 int wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
                        int flag, struct proc *p);
 
+#ifdef WSDISPLAY_SCROLLSUPPORT
+void wsdisplay_scroll (void *v, int op);
+#endif
+
+#define WSDISPLAY_SCROLL_BACKWARD      1
+#define WSDISPLAY_SCROLL_FORWARD       (1 << 1)
+#define WSDISPLAY_SCROLL_RESET         (1 << 2)
+#define WSDISPLAY_SCROLL_LOW           (1 << 3)
+
 int wsdisplay_stat_inject(struct device *dev, u_int type, int value);
 
 /*