[src/trunk]: src/sys/dev Add and use pcdisplay_cursor_init(). Still a couple ...

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

details:   https://anonhg.NetBSD.org/src/rev/f4e770d45872
branches:  trunk
changeset: 480155:f4e770d45872
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Jan 05 16:14:35 2000 +0000

description:
Add and use pcdisplay_cursor_init(). Still a couple of nits with this, I
will resolve when I can test properly.

diffstat:

 sys/dev/ic/pcdisplay_subr.c |  13 ++++++++++++-
 sys/dev/ic/pcdisplayvar.h   |   3 ++-
 sys/dev/ic/vga.c            |   9 +++------
 sys/dev/isa/pcdisplay.c     |   3 ++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diffs (84 lines):

diff -r 43d73df2a345 -r f4e770d45872 sys/dev/ic/pcdisplay_subr.c
--- a/sys/dev/ic/pcdisplay_subr.c       Wed Jan 05 16:04:00 2000 +0000
+++ b/sys/dev/ic/pcdisplay_subr.c       Wed Jan 05 16:14:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.11 2000/01/05 16:04:00 ad Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.12 2000/01/05 16:14:35 ad Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -41,6 +41,17 @@
 #include <dev/wscons/wsdisplayvar.h>
 
 void
+pcdisplay_cursor_init(scr)
+       struct pcdisplayscreen *scr;
+{
+
+#ifdef PCDISPLAY_SOFTCURSOR
+       pcdisplay_6845_write(scr->hdl, cursorh, 0x10);
+       pcdisplay_6845_write(scr->hdl, cursorl, 0x10);
+#endif
+}
+
+void
 pcdisplay_cursor(id, on, row, col)
        void *id;
        int on, row, col;
diff -r 43d73df2a345 -r f4e770d45872 sys/dev/ic/pcdisplayvar.h
--- a/sys/dev/ic/pcdisplayvar.h Wed Jan 05 16:04:00 2000 +0000
+++ b/sys/dev/ic/pcdisplayvar.h Wed Jan 05 16:14:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplayvar.h,v 1.6 1999/09/19 21:48:08 ad Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.7 2000/01/05 16:14:35 ad Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -83,6 +83,7 @@
 #define pcdisplay_6845_write(ph, reg, val) \
        _pcdisplay_6845_write(ph, offsetof(struct reg_mc6845, reg), val)
 
+void   pcdisplay_cursor_init __P((struct pcdisplayscreen *));
 void   pcdisplay_cursor __P((void *, int, int, int));
 #if 0
 unsigned int pcdisplay_mapchar_simple __P((void *, int));
diff -r 43d73df2a345 -r f4e770d45872 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Wed Jan 05 16:04:00 2000 +0000
+++ b/sys/dev/ic/vga.c  Wed Jan 05 16:14:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.23 1999/12/13 14:04:06 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.24 2000/01/05 16:14:35 ad Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -415,11 +415,8 @@
                if (scr->pcs.dispoffset < scr->mindispoffset ||
                    scr->pcs.dispoffset > scr->maxdispoffset)
                        scr->pcs.dispoffset = scr->mindispoffset;
-#ifdef PCDISPLAY_SOFTCURSOR
-               /* disable hardware cursor */
-               vga_6845_write(&vc->hdl, curstart, 0x10);
-               vga_6845_write(&vc->hdl, curend, 0x10);
-#endif
+                       
+               pcdisplay_cursor_init(&scr->pcs);
        } else {
                cpos = 0;
                scr->pcs.dispoffset = scr->mindispoffset;
diff -r 43d73df2a345 -r f4e770d45872 sys/dev/isa/pcdisplay.c
--- a/sys/dev/isa/pcdisplay.c   Wed Jan 05 16:04:00 2000 +0000
+++ b/sys/dev/isa/pcdisplay.c   Wed Jan 05 16:14:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.7 1999/12/06 19:25:59 drochner Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.8 2000/01/05 16:14:36 ad Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -212,6 +212,7 @@
        dc->pcs.vc_crow = cpos / pcdisplay_scr.ncols;
        dc->pcs.vc_ccol = cpos % pcdisplay_scr.ncols;
        dc->pcs.cursoron = 1;
+       pcdisplay_cursor_init(&dc->pcs);
 }
 
 int