Take care of updating the PROMs view of the cursor position in the common fb

code, rather than doing this in only a subset of the fb drivers.

3 files changed, 3 insertions, 43 deletions

diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c
index a8cd63d6b39..70d4843318c 100644
--- a/sys/dev/sbus/bwtwo.c
+++ b/sys/dev/sbus/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.14 2005/03/07 16:44:52 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.15 2005/03/15 18:40:16 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -114,7 +114,6 @@ int bwtwo_show_screen(void *, void *, int, void (*cb)(void *, int, int),
 paddr_t bwtwo_mmap(void *, off_t, int);
 int bwtwo_is_console(int);
 void bwtwo_burner(void *, u_int, u_int);
-void bwtwo_updatecursor(struct rasops_info *);
 
 struct wsdisplay_accessops bwtwo_accessops = {
 	bwtwo_ioctl,
@@ -208,7 +207,6 @@ bwtwoattach(parent, self, aux)
 	fbwscons_init(&sc->sc_sunfb, console ? 0 : RI_CLEAR);
 	
 	if (console) {
-		sc->sc_sunfb.sf_ro.ri_updatecursor = bwtwo_updatecursor;
 		fbwscons_console_init(&sc->sc_sunfb, -1);
 	}
 
@@ -363,15 +361,3 @@ bwtwo_burner(vsc, on, flags)
 	FBC_WRITE(sc, FBC_CTRL, fbc);
 	splx(s);
 }
-
-void
-bwtwo_updatecursor(ri)
-	struct rasops_info *ri;
-{
-	struct bwtwo_softc *sc = ri->ri_hw;
-
-	if (sc->sc_sunfb.sf_crowp != NULL)
-		*sc->sc_sunfb.sf_crowp = ri->ri_crow;
-	if (sc->sc_sunfb.sf_ccolp != NULL)
-		*sc->sc_sunfb.sf_ccolp = ri->ri_ccol;
-}
diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index b437e1df9ac..b9feb0f2e93 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.51 2005/03/08 21:35:03 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.52 2005/03/15 18:40:16 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -76,7 +76,6 @@ void cgsix_ras_copycols(void *, int, int, int, int);
 void cgsix_ras_erasecols(void *, int, int, int, long int);
 void cgsix_ras_eraserows(void *, int, int, long int);
 void cgsix_ras_do_cursor(struct rasops_info *);
-void cgsix_ras_updatecursor(struct rasops_info *);
 int cgsix_setcursor(struct cgsix_softc *, struct wsdisplay_cursor *);
 int cgsix_updatecursor(struct cgsix_softc *, u_int);
 
@@ -241,7 +240,6 @@ cgsixattach(struct device *parent, struct device *self, void *aux)
 	fbwscons_setcolormap(&sc->sc_sunfb, cgsix_setcolor);
 
 	if (console) {
-		sc->sc_sunfb.sf_ro.ri_updatecursor = cgsix_ras_updatecursor;
 		fbwscons_console_init(&sc->sc_sunfb, -1);
 	}
 
@@ -1053,14 +1051,3 @@ cgsix_ras_do_cursor(struct rasops_info *ri)
 	CG6_DRAW_WAIT(sc);
 	CG6_DRAIN(sc);
 }
-
-void
-cgsix_ras_updatecursor(struct rasops_info *ri)
-{
-	struct cgsix_softc *sc = ri->ri_hw;
-
-	if (sc->sc_sunfb.sf_crowp != NULL)
-		*sc->sc_sunfb.sf_crowp = ri->ri_crow;
-	if (sc->sc_sunfb.sf_ccolp != NULL)
-		*sc->sc_sunfb.sf_ccolp = ri->ri_ccol;
-}
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index 7af2d121778..b94fcc4ab53 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.39 2005/03/07 16:44:52 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.40 2005/03/15 18:40:17 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -143,7 +143,6 @@ int cg3_bt_getcmap(union bt_cmap *, struct wsdisplay_cmap *);
 void cgthree_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 void cgthree_burner(void *, u_int, u_int);
 void cgthree_reset(struct cgthree_softc *);
-void cgthree_updatecursor(struct rasops_info *);
 
 struct wsdisplay_accessops cgthree_accessops = {
 	cgthree_ioctl,
@@ -284,7 +283,6 @@ cgthreeattach(struct device *parent, struct device *self, void *aux)
 	fbwscons_setcolormap(&sc->sc_sunfb, cgthree_setcolor);
 
 	if (console) {
-		sc->sc_sunfb.sf_ro.ri_updatecursor = cgthree_updatecursor;
 		fbwscons_console_init(&sc->sc_sunfb,
 		    sc->sc_sunfb.sf_width >= 1024 ? -1 : 0);
 	}
@@ -579,14 +577,3 @@ cgthree_burner(void *vsc, u_int on, u_int flags)
 	FBC_WRITE(sc, CG3_FBC_CTRL, fbc);
 	splx(s);
 }
-
-void
-cgthree_updatecursor(struct rasops_info *ri)
-{
-	struct cgthree_softc *sc = ri->ri_hw;
-
-	if (sc->sc_sunfb.sf_crowp != NULL)
-		*sc->sc_sunfb.sf_crowp = ri->ri_crow;
-	if (sc->sc_sunfb.sf_ccolp != NULL)
-		*sc->sc_sunfb.sf_ccolp = ri->ri_ccol;
-}