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.

3 files changed, 59 insertions, 31 deletions

diff --git a/sys/arch/vax/mbus/legss.c b/sys/arch/vax/mbus/legss.c
index b111e21a98e..2d8c2d178b2 100644
--- a/sys/arch/vax/mbus/legss.c
+++ b/sys/arch/vax/mbus/legss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: legss.c,v 1.3 2008/08/24 20:10:57 miod Exp $	*/
+/*	$OpenBSD: legss.c,v 1.4 2009/09/05 14:09:35 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -163,12 +163,12 @@ const struct wsdisplay_accessops legss_accessops = {
 int	legss_setup_screen(struct legss_screen *);
 void	legss_clear_screen(struct legss_screen *);
 
-void	legss_copycols(void *, int, int, int, int);
-void	legss_copyrows(void *, int, int, int);
-void	legss_do_cursor(struct rasops_info *);
-void	legss_erasecols(void *, int, int, int, long);
-void	legss_eraserows(void *, int, int, long);
-void	legss_putchar(void *, int, int, u_int, long);
+int	legss_copycols(void *, int, int, int, int);
+int	legss_copyrows(void *, int, int, int);
+int	legss_do_cursor(struct rasops_info *);
+int	legss_erasecols(void *, int, int, int, long);
+int	legss_eraserows(void *, int, int, long);
+int	legss_putchar(void *, int, int, u_int, long);
 
 u_int	legss_probe_depth(vaddr_t);
 
@@ -488,7 +488,7 @@ legsscninit()
  * wsdisplay emulops
  */
 
-void
+int
 legss_putchar(void *v, int row, int col, u_int uc, long attr)
 {
 	struct rasops_info *ri = v;
@@ -545,9 +545,11 @@ legss_putchar(void *v, int row, int col, u_int uc, long attr)
 			rp++;
 		}
 	}
+
+	return 0;
 }
 
-void
+int
 legss_copycols(void *v, int row, int src, int dst, int num)
 {
 	struct rasops_info *ri = v;
@@ -589,9 +591,11 @@ legss_copycols(void *v, int row, int src, int dst, int num)
 			sp += ri->ri_stride;
 		}
 	}
+
+	return 0;
 }
 
-void
+int
 legss_erasecols(void *v, int row, int col, int num, long attr)
 {
 	struct rasops_info *ri = v;
@@ -613,9 +617,11 @@ legss_erasecols(void *v, int row, int col, int num, long attr)
 			dp++;
 		}
 	}
+
+	return 0;
 }
 
-void
+int
 legss_copyrows(void *v, int src, int dst, int num)
 {
 	struct rasops_info *ri = v;
@@ -651,9 +657,11 @@ legss_copyrows(void *v, int src, int dst, int num)
 			sp += 1 << 2;
 		}
 	}
+
+	return 0;
 }
 
-void
+int
 legss_eraserows(void *v, int row, int num, long attr)
 {
 	struct rasops_info *ri = v;
@@ -675,9 +683,11 @@ legss_eraserows(void *v, int row, int num, long attr)
 
 		DELTA(dp, delta, int32_t *);
 	}
+
+	return 0;
 }
 
-void
+int
 legss_do_cursor(struct rasops_info *ri)
 {
 	struct wsdisplay_font *font = ri->ri_font;
@@ -699,6 +709,8 @@ legss_do_cursor(struct rasops_info *ri)
 			dp += 4;
 		}
 	}
+
+	return 0;
 }
 
 /* Clear the whole screen */
diff --git a/sys/arch/vax/vsa/gpx.c b/sys/arch/vax/vsa/gpx.c
index b1bf27bdb0e..39d5e8f94b6 100644
--- a/sys/arch/vax/vsa/gpx.c
+++ b/sys/arch/vax/vsa/gpx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpx.c,v 1.20 2008/12/21 21:39:50 miod Exp $	*/
+/*	$OpenBSD: gpx.c,v 1.21 2009/09/05 14:09:35 miod Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -220,12 +220,12 @@ void	gpx_upload_font(struct gpx_screen *);
 int	gpx_viper_write(struct gpx_screen *, u_int, u_int16_t);
 int	gpx_wait(struct gpx_screen *, int);
 
-void	gpx_copycols(void *, int, int, int, int);
-void	gpx_copyrows(void *, int, int, int);
-void	gpx_do_cursor(struct rasops_info *);
-void	gpx_erasecols(void *, int, int, int, long);
-void	gpx_eraserows(void *, int, int, long);
-void	gpx_putchar(void *, int, int, u_int, long);
+int	gpx_copycols(void *, int, int, int, int);
+int	gpx_copyrows(void *, int, int, int);
+int	gpx_do_cursor(struct rasops_info *);
+int	gpx_erasecols(void *, int, int, int, long);
+int	gpx_eraserows(void *, int, int, long);
+int	gpx_putchar(void *, int, int, u_int, long);
 
 /*
  * Autoconf glue
@@ -507,7 +507,7 @@ gpx_burner(void *v, u_int on, u_int flags)
  * wsdisplay emulops
  */
 
-void
+int
 gpx_putchar(void *v, int row, int col, u_int uc, long attr)
 {
 	struct rasops_info *ri = v;
@@ -560,9 +560,11 @@ gpx_putchar(void *v, int row, int col, u_int uc, long attr)
 		gpx_fillrect(ss, dx, dy + font->fontheight - 2, font->fontwidth,
 		    1, attr, LF_R3);	/* fg fill */
 	}
+
+	return 0;
 }
 
-void
+int
 gpx_copycols(void *v, int row, int src, int dst, int cnt)
 {
 	struct rasops_info *ri = v;
@@ -577,9 +579,11 @@ gpx_copycols(void *v, int row, int src, int dst, int cnt)
 	h = font->fontheight;
 
 	gpx_copyrect(ss, sx, y, dx, y, w, h);
+
+	return 0;
 }
 
-void
+int
 gpx_erasecols(void *v, int row, int col, int cnt, long attr)
 {
 	struct rasops_info *ri = v;
@@ -593,9 +597,11 @@ gpx_erasecols(void *v, int row, int col, int cnt, long attr)
 	dy = font->fontheight;
 
 	gpx_fillrect(ss, x, y, dx, dy, attr, LF_R2); /* bg fill */
+
+	return 0;
 }
 
-void
+int
 gpx_copyrows(void *v, int src, int dst, int cnt)
 {
 	struct rasops_info *ri = v;
@@ -610,9 +616,11 @@ gpx_copyrows(void *v, int src, int dst, int cnt)
 	h = cnt * font->fontheight;
 
 	gpx_copyrect(ss, x, sy, x, dy, w, h);
+
+	return 0;
 }
 
-void
+int
 gpx_eraserows(void *v, int row, int cnt, long attr)
 {
 	struct rasops_info *ri = v;
@@ -626,9 +634,11 @@ gpx_eraserows(void *v, int row, int cnt, long attr)
 	dy = cnt * font->fontheight;
 
 	gpx_fillrect(ss, x, y, dx, dy, attr, LF_R2); /* bg fill */
+
+	return 0;
 }
 
-void
+int
 gpx_do_cursor(struct rasops_info *ri)
 {
 	struct gpx_screen *ss = ri->ri_hw;
@@ -640,6 +650,8 @@ gpx_do_cursor(struct rasops_info *ri)
 	h = ri->ri_font->fontheight;
 
 	gpx_fillrect(ss, x, y, w, h, WSCOL_WHITE << 24, LF_R4);	/* invert */
+
+	return 0;
 }
 
 /*
diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c
index 319c35ce394..27d50a88095 100644
--- a/sys/arch/vax/vsa/smg.c
+++ b/sys/arch/vax/vsa/smg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smg.c,v 1.22 2008/12/21 21:39:50 miod Exp $	*/
+/*	$OpenBSD: smg.c,v 1.23 2009/09/05 14:09:35 miod Exp $	*/
 /*	$NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */
 /*
  * Copyright (c) 2006, Miodrag Vallat
@@ -195,8 +195,8 @@ const struct wsdisplay_accessops smg_accessops = {
 
 void	smg_blockmove(struct rasops_info *, u_int, u_int, u_int, u_int, u_int,
 	    int);
-void	smg_copycols(void *, int, int, int, int);
-void	smg_erasecols(void *, int, int, int, long);
+int	smg_copycols(void *, int, int, int, int);
+int	smg_erasecols(void *, int, int, int, long);
 
 int	smg_getcursor(struct smg_screen *, struct wsdisplay_cursor *);
 int	smg_setup_screen(struct smg_screen *);
@@ -775,7 +775,7 @@ smg_blockmove(struct rasops_info *ri, u_int sx, u_int y, u_int dx, u_int cx,
 	}
 }
 
-void
+int
 smg_copycols(void *cookie, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
@@ -787,9 +787,11 @@ smg_copycols(void *cookie, int row, int src, int dst, int n)
 
 	smg_blockmove(ri, src, row, dst, n, ri->ri_font->fontheight,
 	    RR_COPY);
+
+	return 0;
 }
 
-void
+int
 smg_erasecols(void *cookie, int row, int col, int num, long attr)
 {
 	struct rasops_info *ri = cookie;
@@ -803,6 +805,8 @@ smg_erasecols(void *cookie, int row, int col, int num, long attr)
 
 	smg_blockmove(ri, col, row, col, num, ri->ri_font->fontheight,
 	    bg == 0 ? RR_CLEAR : RR_SET);
+
+	return 0;
 }
 
 /*