Change the wsdisplay_emulops return types from void to int; emulops will now

return zero on success and nonzero on failure.
This commit only performs mechanical changes for the existing emulops to
always return zero.

6 files changed, 145 insertions, 82 deletions

diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index 578aeae0a1b..b1f6849cc54 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.40 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.41 2009/09/05 14:09:35 miod Exp $	*/
 /*	$NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
 
 /*
@@ -125,11 +125,11 @@ paddr_t	cgsix_mmap(void *, off_t, int);
 void	cgsix_reset(struct cgsix_softc *, u_int);
 void	cgsix_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
-void	cgsix_ras_copyrows(void *, int, int, int);
-void	cgsix_ras_copycols(void *, int, int, int, int);
-void	cgsix_ras_do_cursor(struct rasops_info *);
-void	cgsix_ras_erasecols(void *, int, int, int, long);
-void	cgsix_ras_eraserows(void *, int, int, long);
+int	cgsix_ras_copyrows(void *, int, int, int);
+int	cgsix_ras_copycols(void *, int, int, int, int);
+int	cgsix_ras_do_cursor(struct rasops_info *);
+int	cgsix_ras_erasecols(void *, int, int, int, long);
+int	cgsix_ras_eraserows(void *, int, int, long);
 void	cgsix_ras_init(struct cgsix_softc *);
 
 struct wsdisplay_accessops cgsix_accessops = {
@@ -496,7 +496,7 @@ cgsix_ras_init(struct cgsix_softc *sc)
 	sc->sc_fbc->fbc_mode = m;
 }
 
-void
+int
 cgsix_ras_copyrows(void *cookie, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
@@ -504,7 +504,7 @@ cgsix_ras_copyrows(void *cookie, int src, int dst, int n)
 	volatile struct cgsix_fbc *fbc = sc->sc_fbc;
 
 	if (dst == src)
-		return;
+		return 0;
 	if (src < 0) {
 		n += src;
 		src = 0;
@@ -518,7 +518,7 @@ cgsix_ras_copyrows(void *cookie, int src, int dst, int n)
 	if (dst + n > ri->ri_rows)
 		n = ri->ri_rows - dst;
 	if (n <= 0)
-		return;
+		return 0;
 	n *= ri->ri_font->fontheight;
 	src *= ri->ri_font->fontheight;
 	dst *= ri->ri_font->fontheight;
@@ -542,9 +542,11 @@ cgsix_ras_copyrows(void *cookie, int src, int dst, int n)
 	fbc->fbc_y3 = ri->ri_yorigin + dst + n - 1;
 	CG6_BLIT_WAIT(fbc);
 	CG6_DRAIN(fbc);
+
+	return 0;
 }
 
-void
+int
 cgsix_ras_copycols(void *cookie, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
@@ -552,9 +554,9 @@ cgsix_ras_copycols(void *cookie, int row, int src, int dst, int n)
 	volatile struct cgsix_fbc *fbc = sc->sc_fbc;
 
 	if (dst == src)
-		return;
+		return 0;
 	if ((row < 0) || (row >= ri->ri_rows))
-		return;
+		return 0;
 	if (src < 0) {
 		n += src;
 		src = 0;
@@ -568,7 +570,7 @@ cgsix_ras_copycols(void *cookie, int row, int src, int dst, int n)
 	if (dst + n > ri->ri_cols)
 		n = ri->ri_cols - dst;
 	if (n <= 0)
-		return;
+		return 0;
 	n *= ri->ri_font->fontwidth;
 	src *= ri->ri_font->fontwidth;
 	dst *= ri->ri_font->fontwidth;
@@ -593,9 +595,11 @@ cgsix_ras_copycols(void *cookie, int row, int src, int dst, int n)
 	fbc->fbc_y3 = ri->ri_yorigin + row + ri->ri_font->fontheight - 1;
 	CG6_BLIT_WAIT(fbc);
 	CG6_DRAIN(fbc);
+
+	return 0;
 }
 
-void
+int
 cgsix_ras_erasecols(void *cookie, int row, int col, int n, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -604,7 +608,7 @@ cgsix_ras_erasecols(void *cookie, int row, int col, int n, long attr)
 	int fg, bg;
 
 	if ((row < 0) || (row >= ri->ri_rows))
-		return;
+		return 0;
 	if (col < 0) {
 		n += col;
 		col = 0;
@@ -612,7 +616,7 @@ cgsix_ras_erasecols(void *cookie, int row, int col, int n, long attr)
 	if (col + n > ri->ri_cols)
 		n = ri->ri_cols - col;
 	if (n <= 0)
-		return;
+		return 0;
 	n *= ri->ri_font->fontwidth;
 	col *= ri->ri_font->fontwidth;
 	row *= ri->ri_font->fontheight;
@@ -635,9 +639,11 @@ cgsix_ras_erasecols(void *cookie, int row, int col, int n, long attr)
 	fbc->fbc_arectx = ri->ri_xorigin + col + n - 1;
 	CG6_DRAW_WAIT(fbc);
 	CG6_DRAIN(fbc);
+
+	return 0;
 }
 
-void
+int
 cgsix_ras_eraserows(void *cookie, int row, int n, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -652,7 +658,7 @@ cgsix_ras_eraserows(void *cookie, int row, int n, long attr)
 	if (row + n > ri->ri_rows)
 		n = ri->ri_rows - row;
 	if (n <= 0)
-		return;
+		return 0;
 
 	ri->ri_ops.unpack_attr(cookie, attr, &fg, &bg, NULL);
 
@@ -682,9 +688,11 @@ cgsix_ras_eraserows(void *cookie, int row, int n, long attr)
 	}
 	CG6_DRAW_WAIT(fbc);
 	CG6_DRAIN(fbc);
+
+	return 0;
 }
 
-void
+int
 cgsix_ras_do_cursor(struct rasops_info *ri)
 {
 	struct cgsix_softc *sc = ri->ri_hw;
@@ -708,4 +716,6 @@ cgsix_ras_do_cursor(struct rasops_info *ri)
 	fbc->fbc_arectx = ri->ri_xorigin + col + ri->ri_font->fontwidth - 1;
 	CG6_DRAW_WAIT(fbc);
 	CG6_DRAIN(fbc);
+
+	return 0;
 }
diff --git a/sys/arch/sparc/dev/mgx.c b/sys/arch/sparc/dev/mgx.c
index 4584cac7c13..aef375330c2 100644
--- a/sys/arch/sparc/dev/mgx.c
+++ b/sys/arch/sparc/dev/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.15 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.16 2009/09/05 14:09:35 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -148,11 +148,11 @@ void	mgx_loadcmap(struct mgx_softc *, int, int);
 int	mgx_putcmap(u_int8_t *, struct wsdisplay_cmap *);
 void	mgx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
-void	mgx_ras_copycols(void *, int, int, int, int);
-void	mgx_ras_copyrows(void *, int, int, int);
-void	mgx_ras_do_cursor(struct rasops_info *);
-void	mgx_ras_erasecols(void *, int, int, int, long int);
-void	mgx_ras_eraserows(void *, int, int, long int);
+int	mgx_ras_copycols(void *, int, int, int, int);
+int	mgx_ras_copyrows(void *, int, int, int);
+int	mgx_ras_do_cursor(struct rasops_info *);
+int	mgx_ras_erasecols(void *, int, int, int, long int);
+int	mgx_ras_eraserows(void *, int, int, long int);
 void	mgx_ras_init(struct mgx_softc *, uint);
 
 uint8_t	mgx_read_1(vaddr_t, uint);
@@ -620,7 +620,7 @@ mgx_ras_init(struct mgx_softc *sc, uint chipid)
 	mgx_write_1(sc->sc_xreg, ATR_BYTEMASK, 0xff);
 }
 
-void
+int
 mgx_ras_copycols(void *v, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -649,9 +649,11 @@ mgx_ras_copycols(void *v, int row, int src, int dst, int n)
 	mgx_write_4(sc->sc_xreg, ATR_DST_XY, ATR_DUAL(row, dst));
 	mgx_write_4(sc->sc_xreg, ATR_WH, ATR_DUAL(ri->ri_font->fontheight, n));
 	mgx_wait_engine(sc);
+
+	return 0;
 }
 
-void
+int
 mgx_ras_copyrows(void *v, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -678,9 +680,11 @@ mgx_ras_copyrows(void *v, int src, int dst, int n)
 	mgx_write_4(sc->sc_xreg, ATR_DST_XY, ATR_DUAL(dst, ri->ri_xorigin));
 	mgx_write_4(sc->sc_xreg, ATR_WH, ATR_DUAL(n, ri->ri_emuwidth));
 	mgx_wait_engine(sc);
+
+	return 0;
 }
 
-void
+int
 mgx_ras_erasecols(void *v, int row, int col, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -706,9 +710,11 @@ mgx_ras_erasecols(void *v, int row, int col, int n, long int attr)
 	mgx_write_4(sc->sc_xreg, ATR_DST_XY, ATR_DUAL(row, col));
 	mgx_write_4(sc->sc_xreg, ATR_WH, ATR_DUAL(ri->ri_font->fontheight, n));
 	mgx_wait_engine(sc);
+
+	return 0;
 }
 
-void
+int
 mgx_ras_eraserows(void *v, int row, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -739,9 +745,11 @@ mgx_ras_eraserows(void *v, int row, int n, long int attr)
 		mgx_write_4(sc->sc_xreg, ATR_WH, ATR_DUAL(n, ri->ri_emuwidth));
 	}
 	mgx_wait_engine(sc);
+
+	return 0;
 }
 
-void
+int
 mgx_ras_do_cursor(struct rasops_info *ri)
 {
 	struct mgx_softc *sc = ri->ri_hw;
@@ -761,4 +769,6 @@ mgx_ras_do_cursor(struct rasops_info *ri)
 	mgx_write_4(sc->sc_xreg, ATR_WH,
 	    ATR_DUAL(ri->ri_font->fontheight, ri->ri_font->fontwidth));
 	mgx_wait_engine(sc);
+
+	return 0;
 }
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c
index c20dfcca05b..d8395f0abc1 100644
--- a/sys/arch/sparc/dev/p9000.c
+++ b/sys/arch/sparc/dev/p9000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9000.c,v 1.22 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: p9000.c,v 1.23 2009/09/05 14:09:35 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -99,11 +99,11 @@ struct wsdisplay_accessops p9000_accessops = {
 	NULL	/* pollc */
 };
 
-void	p9000_ras_copycols(void *, int, int, int, int);
-void	p9000_ras_copyrows(void *, int, int, int);
-void	p9000_ras_do_cursor(struct rasops_info *);
-void	p9000_ras_erasecols(void *, int, int, int, long int);
-void	p9000_ras_eraserows(void *, int, int, long int);
+int	p9000_ras_copycols(void *, int, int, int, int);
+int	p9000_ras_copyrows(void *, int, int, int);
+int	p9000_ras_do_cursor(struct rasops_info *);
+int	p9000_ras_erasecols(void *, int, int, int, long int);
+int	p9000_ras_eraserows(void *, int, int, long int);
 void	p9000_ras_init(struct p9000_softc *);
 
 int	p9000match(struct device *, void *, void *);
@@ -529,7 +529,7 @@ p9000_ras_init(struct p9000_softc *sc)
 	    P9000_COORDS(sc->sc_sunfb.sf_width - 1, sc->sc_sunfb.sf_height - 1));
 }
 
-void
+int
 p9000_ras_copycols(void *v, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -563,9 +563,11 @@ p9000_ras_copycols(void *v, int row, int src, int dst, int n)
 	sc->sc_junk = P9000_READ_CMD(sc, P9000_PE_BLIT);
 
 	p9000_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9000_ras_copyrows(void *v, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -597,9 +599,11 @@ p9000_ras_copyrows(void *v, int src, int dst, int n)
 	sc->sc_junk = P9000_READ_CMD(sc, P9000_PE_BLIT);
 
 	p9000_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9000_ras_erasecols(void *v, int row, int col, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -629,9 +633,11 @@ p9000_ras_erasecols(void *v, int row, int col, int n, long int attr)
 	sc->sc_junk = P9000_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9000_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9000_ras_eraserows(void *v, int row, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -666,9 +672,11 @@ p9000_ras_eraserows(void *v, int row, int n, long int attr)
 	sc->sc_junk = P9000_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9000_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9000_ras_do_cursor(struct rasops_info *ri)
 {
 	struct p9000_softc *sc = ri->ri_hw;
@@ -694,4 +702,6 @@ p9000_ras_do_cursor(struct rasops_info *ri)
 	sc->sc_junk = P9000_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9000_drain(sc);
+
+	return 0;
 }
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 0303bce2221..24eb866cb39 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.48 2008/12/26 23:46:19 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.49 2009/09/05 14:09:35 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2005, 2006, 2008, Miodrag Vallat.
@@ -147,11 +147,11 @@ struct wsdisplay_accessops p9100_accessops = {
 	NULL	/* pollc */
 };
 
-void	p9100_ras_copycols(void *, int, int, int, int);
-void	p9100_ras_copyrows(void *, int, int, int);
-void	p9100_ras_do_cursor(struct rasops_info *);
-void	p9100_ras_erasecols(void *, int, int, int, long int);
-void	p9100_ras_eraserows(void *, int, int, long int);
+int	p9100_ras_copycols(void *, int, int, int, int);
+int	p9100_ras_copyrows(void *, int, int, int);
+int	p9100_ras_do_cursor(struct rasops_info *);
+int	p9100_ras_erasecols(void *, int, int, int, long int);
+int	p9100_ras_eraserows(void *, int, int, long int);
 void	p9100_ras_init(struct p9100_softc *);
 
 int	p9100match(struct device *, void *, void *);
@@ -752,7 +752,7 @@ p9100_ras_init(struct p9100_softc *sc)
 	    P9000_COORDS(sc->sc_sunfb.sf_width - 1, sc->sc_sunfb.sf_height - 1));
 }
 
-void
+int
 p9100_ras_copycols(void *v, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -786,9 +786,11 @@ p9100_ras_copycols(void *v, int row, int src, int dst, int n)
 	sc->sc_junk = P9100_READ_CMD(sc, P9000_PE_BLIT);
 
 	p9100_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9100_ras_copyrows(void *v, int src, int dst, int n)
 {
 	struct rasops_info *ri = v;
@@ -820,9 +822,11 @@ p9100_ras_copyrows(void *v, int src, int dst, int n)
 	sc->sc_junk = P9100_READ_CMD(sc, P9000_PE_BLIT);
 
 	p9100_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9100_ras_erasecols(void *v, int row, int col, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -853,9 +857,11 @@ p9100_ras_erasecols(void *v, int row, int col, int n, long int attr)
 	sc->sc_junk = P9100_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9100_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9100_ras_eraserows(void *v, int row, int n, long int attr)
 {
 	struct rasops_info *ri = v;
@@ -891,9 +897,11 @@ p9100_ras_eraserows(void *v, int row, int n, long int attr)
 	sc->sc_junk = P9100_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9100_drain(sc);
+
+	return 0;
 }
 
-void
+int
 p9100_ras_do_cursor(struct rasops_info *ri)
 {
 	struct p9100_softc *sc = ri->ri_hw;
@@ -920,6 +928,8 @@ p9100_ras_do_cursor(struct rasops_info *ri)
 	sc->sc_junk = P9100_READ_CMD(sc, P9000_PE_QUAD);
 
 	p9100_drain(sc);
+
+	return 0;
 }
 
 /*
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index 5cbf32027da..8c374b6c8a7 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcx.c,v 1.43 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: tcx.c,v 1.44 2009/09/05 14:09:35 miod Exp $	*/
 /*	$NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
 
 /*
@@ -99,25 +99,25 @@ struct tcx_softc {
 	paddr_t	sc_stipple;		/* Stipple space PA */
 	paddr_t	sc_blit;		/* Blitter space PA */
 	int	sc_blit_width;		/* maximal blith width */
-	void	(*sc_plain_copycols)(void *, int, int, int, int);
+	int	(*sc_plain_copycols)(void *, int, int, int, int);
 };
 
 void	tcx_accel_init(struct tcx_softc *, struct confargs *);
 void	tcx_accel_plug(struct tcx_softc *, struct confargs *);
 void	tcx_blit(struct tcx_softc *, uint32_t, uint32_t, int);
 void	tcx_burner(void *, u_int, u_int);
-void	tcx_copyrows(void *, int, int, int);
-void	tcx_copycols(void *, int, int, int, int);
-void	tcx_do_cursor(struct rasops_info *);
-void	tcx_erasecols(void *, int, int, int, long);
-void	tcx_eraserows(void *, int, int, long);
+int	tcx_copyrows(void *, int, int, int);
+int	tcx_copycols(void *, int, int, int, int);
+int	tcx_do_cursor(struct rasops_info *);
+int	tcx_erasecols(void *, int, int, int, long);
+int	tcx_eraserows(void *, int, int, long);
 int	tcx_intr(void *);
 int	tcx_ioctl(void *, u_long, caddr_t, int, struct proc *);
 static __inline__
 void	tcx_loadcmap_deferred(struct tcx_softc *, u_int, u_int);
 paddr_t	tcx_mmap(void *, off_t, int);
 void	tcx_prom(void *);
-void	tcx_putchar(void *, int, int, u_int, long);
+int	tcx_putchar(void *, int, int, u_int, long);
 void	tcx_reset(struct tcx_softc *, int);
 void	tcx_s24_reset(struct tcx_softc *, int);
 void	tcx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
@@ -660,7 +660,7 @@ tcx_accel_plug(struct tcx_softc *sc, struct confargs *ca)
  * to invoke it many times, and handle overlapping regions ourselves.
  */
 
-void
+int
 tcx_copycols(void *cookie, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
@@ -670,8 +670,7 @@ tcx_copycols(void *cookie, int row, int src, int dst, int n)
 
 	if (dst > src && dst < src + n) {
 		/* Areas overlap, do it the slow but safe way */
-		(*sc->sc_plain_copycols)(cookie, row, src, dst, n);
-		return;
+		return (*sc->sc_plain_copycols)(cookie, row, src, dst, n);
 	}
 
 	/* Areas do not overlap dangerously, copy forwards */
@@ -692,9 +691,11 @@ tcx_copycols(void *cookie, int row, int src, int dst, int n)
 		srcaddr += sc->sc_sunfb.sf_width;
 		dstaddr += sc->sc_sunfb.sf_width;
 	}
+
+	return 0;
 }
 
-void
+int
 tcx_copyrows(void *cookie, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
@@ -733,6 +734,8 @@ tcx_copyrows(void *cookie, int src, int dst, int n)
 			srcaddr += sc->sc_sunfb.sf_width;
 		}
 	}
+
+	return 0;
 }
 
 /*
@@ -823,7 +826,7 @@ tcx_stipple(struct tcx_softc *sc, int x, int y, int cnt, int rop, int bg)
 	}
 }
 
-void
+int
 tcx_erasecols(void *cookie, int row, int col, int n, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -839,9 +842,11 @@ tcx_erasecols(void *cookie, int row, int col, int n, long attr)
 	cury = ri->ri_yorigin + row * ri->ri_font->fontheight;
 	for (h = ri->ri_font->fontheight; h != 0; cury++, h--)
 		tcx_stipple(sc, sx, cury, n, GXcopy, bg);
+
+	return 0;
 }
 
-void
+int
 tcx_eraserows(void *cookie, int row, int n, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -864,9 +869,11 @@ tcx_eraserows(void *cookie, int row, int n, long attr)
 
 	for (; n != 0; y++, n--)
 		tcx_stipple(sc, x, y, w, GXcopy, bg);
+
+	return 0;
 }
 
-void
+int
 tcx_do_cursor(struct rasops_info *ri)
 {
 	struct tcx_softc *sc = ri->ri_hw;
@@ -877,9 +884,11 @@ tcx_do_cursor(struct rasops_info *ri)
 
 	for (n = ri->ri_font->fontheight; n != 0; y++, n--)
 		tcx_stipple(sc, x, y, ri->ri_font->fontwidth, GXinvert, 0xff);
+
+	return 0;
 }
 
-void
+int
 tcx_putchar(void *cookie, int row, int col, u_int uc, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -994,4 +1003,6 @@ tcx_putchar(void *cookie, int row, int col, u_int uc, long attr)
 			soffs += sc->sc_sunfb.sf_width << 3;
 		}
 	}
+
+	return 0;
 }
diff --git a/sys/arch/sparc/dev/zx.c b/sys/arch/sparc/dev/zx.c
index 89770094a8f..1627474f2ff 100644
--- a/sys/arch/sparc/dev/zx.c
+++ b/sys/arch/sparc/dev/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.22 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: zx.c,v 1.23 2009/09/05 14:09:35 miod Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -160,12 +160,12 @@ void	zx_fillrect(struct rasops_info *, int, int, int, int, long, int);
 int	zx_intr(void *);
 int	zx_putcmap(struct zx_softc *);
 
-void	zx_copycols(void *, int, int, int, int);
-void	zx_copyrows(void *, int, int, int);
-void	zx_do_cursor(struct rasops_info *);
-void	zx_erasecols(void *, int, int, int, long);
-void	zx_eraserows(void *, int, int, long);
-void	zx_putchar(void *, int, int, u_int, long);
+int	zx_copycols(void *, int, int, int, int);
+int	zx_copyrows(void *, int, int, int);
+int	zx_do_cursor(struct rasops_info *);
+int	zx_erasecols(void *, int, int, int, long);
+int	zx_eraserows(void *, int, int, long);
+int	zx_putchar(void *, int, int, u_int, long);
 
 struct cfattach zx_ca = {
 	sizeof(struct zx_softc), zx_match, zx_attach
@@ -614,16 +614,18 @@ zx_copyrect(struct rasops_info *ri, int sx, int sy, int dx, int dy, int w,
 	SETREG(zc->zc_copy, ZX_COORDS(dx, dy));
 }
 
-void
+int
 zx_do_cursor(struct rasops_info *ri)
 {
 
 	zx_fillrect(ri, ri->ri_ccol, ri->ri_crow, 1, 1, WSCOL_BLACK << 16,
 	    ZX_ROP_NEW_XOR_OLD | ZX_ATTR_WE_ENABLE | ZX_ATTR_OE_ENABLE |
 	    ZX_ATTR_FORCE_WID);
+
+	return 0;
 }
 
-void
+int
 zx_erasecols(void *cookie, int row, int col, int num, long attr)
 {
 	struct rasops_info *ri;
@@ -631,9 +633,11 @@ zx_erasecols(void *cookie, int row, int col, int num, long attr)
 	ri = (struct rasops_info *)cookie;
 
 	zx_fillrect(ri, col, row, num, 1, attr, ZX_STD_ROP);
+
+	return 0;
 }
 
-void
+int
 zx_eraserows(void *cookie, int row, int num, long attr)
 {
 	struct rasops_info *ri;
@@ -661,9 +665,11 @@ zx_eraserows(void *cookie, int row, int num, long attr)
 		SETREG(zc->zc_fill, ZX_COORDS(0, 0) | ZX_EXTENT_DIR_BACKWARDS);
 	} else
 		zx_fillrect(ri, 0, row, ri->ri_cols, num, attr, ZX_STD_ROP);
+
+	return 0;
 }
 
-void
+int
 zx_copyrows(void *cookie, int src, int dst, int num)
 {
 	struct rasops_info *ri;
@@ -671,9 +677,11 @@ zx_copyrows(void *cookie, int src, int dst, int num)
 	ri = (struct rasops_info *)cookie;
 
 	zx_copyrect(ri, 0, src, 0, dst, ri->ri_cols, num);
+
+	return 0;
 }
 
-void
+int
 zx_copycols(void *cookie, int row, int src, int dst, int num)
 {
 	struct rasops_info *ri;
@@ -681,9 +689,11 @@ zx_copycols(void *cookie, int row, int src, int dst, int num)
 	ri = (struct rasops_info *)cookie;
 
 	zx_copyrect(ri, src, row, dst, row, num, 1);
+
+	return 0;
 }
 
-void
+int
 zx_putchar(void *cookie, int row, int col, u_int uc, long attr)
 {
 	struct rasops_info *ri;
@@ -707,7 +717,7 @@ zx_putchar(void *cookie, int row, int col, u_int uc, long attr)
 	if (uc == ' ') {
 		zx_fillrect(ri, col, row, 1, 1, attr, ZX_STD_ROP);
 		if (ul == 0)
-			return;
+			return 0;
 
 		dp += font->fontheight << ZX_WWIDTH;
 
@@ -755,6 +765,8 @@ zx_putchar(void *cookie, int row, int col, u_int uc, long attr)
 		dp -= 2 << ZX_WWIDTH;
 		*dp = 0xffffffff;
 	}
+
+	return 0;
 }
 
 void