summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/s3c2xx0/s3c24x0_lcd.c22
-rw-r--r--sys/arch/hp300/dev/diofb.c32
-rw-r--r--sys/arch/luna88k/dev/lunafb.c14
-rw-r--r--sys/arch/luna88k/dev/omrasops.c42
-rw-r--r--sys/arch/sgi/dev/gbe.c38
-rw-r--r--sys/arch/sparc/dev/cgsix.c48
-rw-r--r--sys/arch/sparc/dev/mgx.c32
-rw-r--r--sys/arch/sparc/dev/p9000.c32
-rw-r--r--sys/arch/sparc/dev/p9100.c32
-rw-r--r--sys/arch/sparc/dev/tcx.c43
-rw-r--r--sys/arch/sparc/dev/zx.c40
-rw-r--r--sys/arch/sparc64/dev/creator.c30
-rw-r--r--sys/arch/sparc64/dev/gfxp.c26
-rw-r--r--sys/arch/sparc64/dev/ifb.c70
-rw-r--r--sys/arch/sparc64/dev/machfb.c26
-rw-r--r--sys/arch/sparc64/dev/pcons.c8
-rw-r--r--sys/arch/sparc64/dev/radeonfb.c26
-rw-r--r--sys/arch/sparc64/dev/raptor.c26
-rw-r--r--sys/arch/vax/mbus/legss.c38
-rw-r--r--sys/arch/vax/vsa/gpx.c38
-rw-r--r--sys/arch/vax/vsa/smg.c14
21 files changed, 432 insertions, 245 deletions
diff --git a/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c b/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
index b71c7ebea84..02fd926e028 100644
--- a/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
+++ b/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3c24x0_lcd.c,v 1.2 2009/01/05 20:37:16 jasper Exp $ */
+/* $OpenBSD: s3c24x0_lcd.c,v 1.3 2009/09/05 14:09:33 miod Exp $ */
/* $NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $ */
/*
@@ -706,48 +706,48 @@ s3c24x0_lcd_mapchar(void *cookie, int c, unsigned int *cp)
return (* scr->rinfo.ri_ops.mapchar)(&scr->rinfo, c, cp);
}
-static void
+static int
s3c24x0_lcd_putchar(void *cookie, int row, int col, u_int uc, long attr)
{
struct s3c24x0_lcd_screen *scr = cookie;
- (* scr->rinfo.ri_ops.putchar)(&scr->rinfo,
+ return (* scr->rinfo.ri_ops.putchar)(&scr->rinfo,
row, col, uc, attr);
}
-static void
+static int
s3c24x0_lcd_copycols(void *cookie, int row, int src, int dst, int num)
{
struct s3c24x0_lcd_screen *scr = cookie;
- (* scr->rinfo.ri_ops.copycols)(&scr->rinfo,
+ return (* scr->rinfo.ri_ops.copycols)(&scr->rinfo,
row, src, dst, num);
}
-static void
+static int
s3c24x0_lcd_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct s3c24x0_lcd_screen *scr = cookie;
- (* scr->rinfo.ri_ops.erasecols)(&scr->rinfo,
+ return (* scr->rinfo.ri_ops.erasecols)(&scr->rinfo,
row, col, num, attr);
}
-static void
+static int
s3c24x0_lcd_copyrows(void *cookie, int src, int dst, int num)
{
struct s3c24x0_lcd_screen *scr = cookie;
- (* scr->rinfo.ri_ops.copyrows)(&scr->rinfo,
+ return (* scr->rinfo.ri_ops.copyrows)(&scr->rinfo,
src, dst, num);
}
-static void
+static int
s3c24x0_lcd_eraserows(void *cookie, int row, int num, long attr)
{
struct s3c24x0_lcd_screen *scr = cookie;
- (* scr->rinfo.ri_ops.eraserows)(&scr->rinfo,
+ return (* scr->rinfo.ri_ops.eraserows)(&scr->rinfo,
row, num, attr);
}
diff --git a/sys/arch/hp300/dev/diofb.c b/sys/arch/hp300/dev/diofb.c
index 908e1771c28..25ba07ce5d7 100644
--- a/sys/arch/hp300/dev/diofb.c
+++ b/sys/arch/hp300/dev/diofb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diofb.c,v 1.16 2006/11/29 19:08:19 miod Exp $ */
+/* $OpenBSD: diofb.c,v 1.17 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -82,11 +82,11 @@
extern int rasops_alloc_cattr(void *, int, int, int, long *);
int diofb_alloc_attr(void *, int, int, int, long *);
-void diofb_copycols(void *, int, int, int, int);
-void diofb_erasecols(void *, int, int, int, long);
-void diofb_copyrows(void *, int, int, int);
-void diofb_eraserows(void *, int, int, long);
-void diofb_do_cursor(struct rasops_info *);
+int diofb_copycols(void *, int, int, int, int);
+int diofb_erasecols(void *, int, int, int, long);
+int diofb_copyrows(void *, int, int, int);
+int diofb_eraserows(void *, int, int, long);
+int diofb_do_cursor(struct rasops_info *);
/*
* Frame buffer geometry initialization
@@ -338,7 +338,7 @@ diofb_alloc_attr(void *cookie, int fg, int bg, int flg, long *attr)
return (rasops_alloc_cattr(cookie, fg, bg, flg, attr));
}
-void
+int
diofb_copycols(void *cookie, int row, int src, int dst, int n)
{
struct rasops_info *ri = cookie;
@@ -352,9 +352,11 @@ diofb_copycols(void *cookie, int row, int src, int dst, int n)
(*fb->bmv)(fb, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
n, ri->ri_font->fontheight, RR_COPY, 0xff);
+
+ return 0;
}
-void
+int
diofb_copyrows(void *cookie, int src, int dst, int n)
{
struct rasops_info *ri = cookie;
@@ -367,9 +369,11 @@ diofb_copyrows(void *cookie, int src, int dst, int n)
(*fb->bmv)(fb, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst,
ri->ri_emuwidth, n, RR_COPY, 0xff);
+
+ return 0;
}
-void
+int
diofb_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -390,9 +394,11 @@ diofb_erasecols(void *cookie, int row, int col, int num, long attr)
if ((*fb->bmv)(fb, scol, srow, scol, srow, snum,
ri->ri_font->fontheight, RR_CLEAR, 0xff ^ bg) != 0)
rasops_erasecols(cookie, row, col, num, attr);
+
+ return 0;
}
-void
+int
diofb_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -415,9 +421,11 @@ diofb_eraserows(void *cookie, int row, int num, long attr)
}
if (rc != 0)
rasops_eraserows(cookie, row, num, attr);
+
+ return 0;
}
-void
+int
diofb_do_cursor(struct rasops_info *ri)
{
struct diofb *fb = ri->ri_hw;
@@ -427,6 +435,8 @@ diofb_do_cursor(struct rasops_info *ri)
y = ri->ri_crow * ri->ri_font->fontheight + ri->ri_yorigin;
(*fb->bmv)(fb, x, y, x, y, ri->ri_font->fontwidth,
ri->ri_font->fontheight, RR_INVERT, 0xff);
+
+ return 0;
}
/*
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c
index 05c054d53f7..3e2c157b4b2 100644
--- a/sys/arch/luna88k/dev/lunafb.c
+++ b/sys/arch/luna88k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lunafb.c,v 1.9 2008/06/26 05:42:11 ray Exp $ */
+/* $OpenBSD: lunafb.c,v 1.10 2009/09/05 14:09:35 miod Exp $ */
/* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */
/*-
@@ -106,12 +106,12 @@ struct om_hwdevconfig omfb_console_dc;
void omfb_getdevconfig(paddr_t, struct om_hwdevconfig *);
/* in omrasops.c */
-void om_cursor(void *, int, int, int);
-void om_putchar(void *, int, int, u_int, long);
-void om_copycols(void *, int, int, int, int);
-void om_copyrows(void *, int, int, int num);
-void om_erasecols(void *, int, int, int, long);
-void om_eraserows(void *, int, int, long);
+int om_cursor(void *, int, int, int);
+int om_putchar(void *, int, int, u_int, long);
+int om_copycols(void *, int, int, int, int);
+int om_copyrows(void *, int, int, int num);
+int om_erasecols(void *, int, int, int, long);
+int om_eraserows(void *, int, int, long);
struct wsscreen_descr omfb_stdscreen = {
"std"
diff --git a/sys/arch/luna88k/dev/omrasops.c b/sys/arch/luna88k/dev/omrasops.c
index 9a457daace2..b62a36846be 100644
--- a/sys/arch/luna88k/dev/omrasops.c
+++ b/sys/arch/luna88k/dev/omrasops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omrasops.c,v 1.5 2008/06/26 05:42:11 ray Exp $ */
+/* $OpenBSD: omrasops.c,v 1.6 2009/09/05 14:09:35 miod Exp $ */
/* $NetBSD: omrasops.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
/*-
@@ -48,12 +48,12 @@
#include <dev/rasops/rasops.h>
/* wscons emulator operations */
-void om_cursor(void *, int, int, int);
-void om_putchar(void *, int, int, u_int, long);
-void om_copycols(void *, int, int, int, int);
-void om_copyrows(void *, int, int, int num);
-void om_erasecols(void *, int, int, int, long);
-void om_eraserows(void *, int, int, long);
+int om_cursor(void *, int, int, int);
+int om_putchar(void *, int, int, u_int, long);
+int om_copycols(void *, int, int, int, int);
+int om_copyrows(void *, int, int, int num);
+int om_erasecols(void *, int, int, int, long);
+int om_eraserows(void *, int, int, long);
#define ALL1BITS (~0U)
#define ALL0BITS (0U)
@@ -67,7 +67,7 @@ void om_eraserows(void *, int, int, long);
/*
* Blit a character at the specified co-ordinates.
*/
-void
+int
om_putchar(cookie, row, startcol, uc, attr)
void *cookie;
int row, startcol;
@@ -127,9 +127,11 @@ om_putchar(cookie, row, startcol, uc, attr)
height--;
}
}
+
+ return 0;
}
-void
+int
om_erasecols(cookie, row, startcol, ncols, attr)
void *cookie;
int row, startcol, ncols;
@@ -179,9 +181,11 @@ om_erasecols(cookie, row, startcol, ncols, attr)
height--;
}
}
+
+ return 0;
}
-void
+int
om_eraserows(cookie, startrow, nrows, attr)
void *cookie;
int startrow, nrows;
@@ -216,9 +220,11 @@ om_eraserows(cookie, startrow, nrows, attr)
width = w;
height--;
}
+
+ return 0;
}
-void
+int
om_copyrows(cookie, srcrow, dstrow, nrows)
void *cookie;
int srcrow, dstrow, nrows;
@@ -257,9 +263,11 @@ om_copyrows(cookie, srcrow, dstrow, nrows)
width = w;
height--;
}
+
+ return 0;
}
-void
+int
om_copycols(cookie, startrow, srccol, dstcol, ncols)
void *cookie;
int startrow, srccol, dstcol, ncols;
@@ -348,16 +356,18 @@ om_copycols(cookie, startrow, srccol, dstcol, ncols)
height--;
}
}
- return;
+ return 0;
hardluckalignment:
/* alignments painfully disagree */
+
+ return 0;
}
/*
* Position|{enable|disable} the cursor at the specified location.
*/
-void
+int
om_cursor(cookie, on, row, col)
void *cookie;
int on, row, col;
@@ -370,7 +380,7 @@ om_cursor(cookie, on, row, col)
if (!on) {
/* make sure it's on */
if ((ri->ri_flg & RI_CURSOR) == 0)
- return;
+ return 0;
row = ri->ri_crow;
col = ri->ri_ccol;
@@ -414,4 +424,6 @@ om_cursor(cookie, on, row, col)
}
}
ri->ri_flg ^= RI_CURSOR;
+
+ return 0;
}
diff --git a/sys/arch/sgi/dev/gbe.c b/sys/arch/sgi/dev/gbe.c
index 734a36d027c..c60030b1c9d 100644
--- a/sys/arch/sgi/dev/gbe.c
+++ b/sys/arch/sgi/dev/gbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gbe.c,v 1.7 2009/02/24 14:37:29 jsing Exp $ */
+/* $OpenBSD: gbe.c,v 1.8 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Joel Sing <jsing@openbsd.org>
@@ -136,12 +136,12 @@ void gbe_burner(void *, u_int, u_int);
void gbe_rop(struct gbe_softc *, int, int, int, int, int);
void gbe_copyrect(struct gbe_softc *, int, int, int, int, int, int, int);
void gbe_fillrect(struct gbe_softc *, int, int, int, int, int);
-void gbe_do_cursor(struct rasops_info *);
-void gbe_putchar(void *, int, int, u_int, long);
-void gbe_copycols(void *, int, int, int, int);
-void gbe_erasecols(void *, int, int, int, long);
-void gbe_copyrows(void *, int, int, int);
-void gbe_eraserows(void *, int, int, long);
+int gbe_do_cursor(struct rasops_info *);
+int gbe_putchar(void *, int, int, u_int, long);
+int gbe_copycols(void *, int, int, int, int);
+int gbe_erasecols(void *, int, int, int, long);
+int gbe_copyrows(void *, int, int, int);
+int gbe_eraserows(void *, int, int, long);
static struct gbe_screen gbe_consdata;
static int gbe_console;
@@ -1143,7 +1143,7 @@ gbe_fillrect(struct gbe_softc *gsc, int x, int y, int w, int h, int bg)
((x + w - 1) << 16) | ((y + h - 1) & 0xffff));
}
-void
+int
gbe_do_cursor(struct rasops_info *ri)
{
struct gbe_softc *sc = ri->ri_hw;
@@ -1155,9 +1155,11 @@ gbe_do_cursor(struct rasops_info *ri)
y = ri->ri_yorigin + ri->ri_crow * h;
gbe_rop(sc, x, y, w, h, LOGIC_OP_XOR);
+
+ return 0;
}
-void
+int
gbe_putchar(void *cookie, int row, int col, u_int uc, long attr)
{
struct rasops_info *ri = cookie;
@@ -1178,9 +1180,11 @@ gbe_putchar(void *cookie, int row, int col, u_int uc, long attr)
screen->ro_curpos++;
if ((screen->ro_curpos + 1) * w > screen->ri_tile.ri_width)
screen->ro_curpos = 0;
+
+ return 0;
}
-void
+int
gbe_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -1194,9 +1198,11 @@ gbe_copycols(void *cookie, int row, int src, int dst, int num)
gbe_copyrect(sc, BUF_TYPE_TLB_A, ri->ri_xorigin + src,
ri->ri_yorigin + row, ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
gbe_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -1211,9 +1217,11 @@ gbe_erasecols(void *cookie, int row, int col, int num, long attr)
gbe_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
gbe_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -1225,9 +1233,11 @@ gbe_copyrows(void *cookie, int src, int dst, int num)
gbe_copyrect(sc, BUF_TYPE_TLB_A, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
gbe_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -1248,6 +1258,8 @@ gbe_eraserows(void *cookie, int row, int num, long attr)
}
gbe_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
/*
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
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index 079926f817c..52593ea6a03 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: creator.c,v 1.41 2009/07/16 21:03:09 kettenis Exp $ */
+/* $OpenBSD: creator.c,v 1.42 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -53,9 +53,9 @@ paddr_t creator_mmap(void *, off_t, int);
void creator_ras_fifo_wait(struct creator_softc *, int);
void creator_ras_wait(struct creator_softc *);
void creator_ras_init(struct creator_softc *);
-void creator_ras_copyrows(void *, int, int, int);
-void creator_ras_erasecols(void *, int, int, int, long int);
-void creator_ras_eraserows(void *, int, int, long int);
+int creator_ras_copyrows(void *, int, int, int);
+int creator_ras_erasecols(void *, int, int, int, long int);
+int creator_ras_eraserows(void *, int, int, long int);
void creator_ras_fill(struct creator_softc *);
void creator_ras_setfg(struct creator_softc *, int32_t);
int creator_setcursor(struct creator_softc *, struct wsdisplay_cursor *);
@@ -578,7 +578,7 @@ creator_ras_init(sc)
creator_ras_wait(sc);
}
-void
+int
creator_ras_eraserows(cookie, row, n, attr)
void *cookie;
int row, n;
@@ -595,7 +595,7 @@ creator_ras_eraserows(cookie, row, n, 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);
creator_ras_fill(sc);
@@ -614,9 +614,11 @@ creator_ras_eraserows(cookie, row, n, attr)
FBC_WRITE(sc, FFB_FBC_BW, ri->ri_emuwidth);
}
creator_ras_wait(sc);
+
+ return 0;
}
-void
+int
creator_ras_erasecols(cookie, row, col, n, attr)
void *cookie;
int row, col, n;
@@ -627,7 +629,7 @@ creator_ras_erasecols(cookie, row, col, n, attr)
int fg, bg;
if ((row < 0) || (row >= ri->ri_rows))
- return;
+ return 0;
if (col < 0) {
n += col;
col = 0;
@@ -635,7 +637,7 @@ creator_ras_erasecols(cookie, row, col, n, 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;
@@ -649,6 +651,8 @@ creator_ras_erasecols(cookie, row, col, n, attr)
FBC_WRITE(sc, FFB_FBC_BH, ri->ri_font->fontheight);
FBC_WRITE(sc, FFB_FBC_BW, n - 1);
creator_ras_wait(sc);
+
+ return 0;
}
void
@@ -661,7 +665,7 @@ creator_ras_fill(sc)
creator_ras_wait(sc);
}
-void
+int
creator_ras_copyrows(cookie, src, dst, n)
void *cookie;
int src, dst, n;
@@ -670,7 +674,7 @@ creator_ras_copyrows(cookie, src, dst, n)
struct creator_softc *sc = ri->ri_hw;
if (dst == src)
- return;
+ return 0;
if (src < 0) {
n += src;
src = 0;
@@ -684,7 +688,7 @@ creator_ras_copyrows(cookie, src, dst, 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;
@@ -699,6 +703,8 @@ creator_ras_copyrows(cookie, src, dst, n)
FBC_WRITE(sc, FFB_FBC_BH, n);
FBC_WRITE(sc, FFB_FBC_BW, ri->ri_emuwidth);
creator_ras_wait(sc);
+
+ return 0;
}
void
diff --git a/sys/arch/sparc64/dev/gfxp.c b/sys/arch/sparc64/dev/gfxp.c
index 88ee6b44448..b3b36741d02 100644
--- a/sys/arch/sparc64/dev/gfxp.c
+++ b/sys/arch/sparc64/dev/gfxp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gfxp.c,v 1.10 2009/06/28 13:40:51 kettenis Exp $ */
+/* $OpenBSD: gfxp.c,v 1.11 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@@ -155,10 +155,10 @@ int gfxp_getcmap(struct gfxp_softc *, struct wsdisplay_cmap *);
int gfxp_putcmap(struct gfxp_softc *, struct wsdisplay_cmap *);
void gfxp_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
-void gfxp_copycols(void *, int, int, int, int);
-void gfxp_erasecols(void *, int, int, int, long);
-void gfxp_copyrows(void *, int, int, int);
-void gfxp_eraserows(void *, int, int, long);
+int gfxp_copycols(void *, int, int, int, int);
+int gfxp_erasecols(void *, int, int, int, long);
+int gfxp_copyrows(void *, int, int, int);
+int gfxp_eraserows(void *, int, int, long);
void gfxp_init(struct gfxp_softc *);
void gfxp_reinit(struct gfxp_softc *);
@@ -456,7 +456,7 @@ gfxp_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
* Accelerated routines.
*/
-void
+int
gfxp_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -470,9 +470,11 @@ gfxp_copycols(void *cookie, int row, int src, int dst, int num)
gfxp_copyrect(sc, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
gfxp_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -487,9 +489,11 @@ gfxp_erasecols(void *cookie, int row, int col, int num, long attr)
gfxp_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
gfxp_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -501,9 +505,11 @@ gfxp_copyrows(void *cookie, int src, int dst, int num)
gfxp_copyrect(sc, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
gfxp_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -524,6 +530,8 @@ gfxp_eraserows(void *cookie, int row, int num, long attr)
w = ri->ri_emuwidth;
}
gfxp_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
void
diff --git a/sys/arch/sparc64/dev/ifb.c b/sys/arch/sparc64/dev/ifb.c
index 64b50550afa..55d63488411 100644
--- a/sys/arch/sparc64/dev/ifb.c
+++ b/sys/arch/sparc64/dev/ifb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifb.c,v 1.17 2009/06/27 22:43:41 miod Exp $ */
+/* $OpenBSD: ifb.c,v 1.18 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Miodrag Vallat.
@@ -338,19 +338,19 @@ void ifb_rop_ifb(void *, int, int, int, int, int, int, uint32_t, int32_t);
void ifb_rop_jfb(void *, int, int, int, int, int, int, uint32_t, int32_t);
int ifb_rop_wait(struct ifb_softc *);
-void ifb_putchar_dumb(void *, int, int, u_int, long);
-void ifb_copycols_dumb(void *, int, int, int, int);
-void ifb_erasecols_dumb(void *, int, int, int, long);
-void ifb_copyrows_dumb(void *, int, int, int);
-void ifb_eraserows_dumb(void *, int, int, long);
-void ifb_do_cursor_dumb(struct rasops_info *);
+int ifb_putchar_dumb(void *, int, int, u_int, long);
+int ifb_copycols_dumb(void *, int, int, int, int);
+int ifb_erasecols_dumb(void *, int, int, int, long);
+int ifb_copyrows_dumb(void *, int, int, int);
+int ifb_eraserows_dumb(void *, int, int, long);
+int ifb_do_cursor_dumb(struct rasops_info *);
-void ifb_putchar(void *, int, int, u_int, long);
-void ifb_copycols(void *, int, int, int, int);
-void ifb_erasecols(void *, int, int, int, long);
-void ifb_copyrows(void *, int, int, int);
-void ifb_eraserows(void *, int, int, long);
-void ifb_do_cursor(struct rasops_info *);
+int ifb_putchar(void *, int, int, u_int, long);
+int ifb_copycols(void *, int, int, int, int);
+int ifb_erasecols(void *, int, int, int, long);
+int ifb_copyrows(void *, int, int, int);
+int ifb_eraserows(void *, int, int, long);
+int ifb_do_cursor(struct rasops_info *);
int
ifbmatch(struct device *parent, void *cf, void *aux)
@@ -845,7 +845,7 @@ ifb_mapregs(struct ifb_softc *sc, struct pci_attach_args *pa)
* Non accelerated routines.
*/
-void
+int
ifb_putchar_dumb(void *cookie, int row, int col, u_int uc, long attr)
{
struct rasops_info *ri = cookie;
@@ -855,9 +855,11 @@ ifb_putchar_dumb(void *cookie, int row, int col, u_int uc, long attr)
sc->sc_old_ops.putchar(cookie, row, col, uc, attr);
ri->ri_bits = (void *)sc->sc_fb8bank1_vaddr;
sc->sc_old_ops.putchar(cookie, row, col, uc, attr);
+
+ return 0;
}
-void
+int
ifb_copycols_dumb(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -867,9 +869,11 @@ ifb_copycols_dumb(void *cookie, int row, int src, int dst, int num)
sc->sc_old_ops.copycols(cookie, row, src, dst, num);
ri->ri_bits = (void *)sc->sc_fb8bank1_vaddr;
sc->sc_old_ops.copycols(cookie, row, src, dst, num);
+
+ return 0;
}
-void
+int
ifb_erasecols_dumb(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -879,9 +883,11 @@ ifb_erasecols_dumb(void *cookie, int row, int col, int num, long attr)
sc->sc_old_ops.erasecols(cookie, row, col, num, attr);
ri->ri_bits = (void *)sc->sc_fb8bank1_vaddr;
sc->sc_old_ops.erasecols(cookie, row, col, num, attr);
+
+ return 0;
}
-void
+int
ifb_copyrows_dumb(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -891,9 +897,11 @@ ifb_copyrows_dumb(void *cookie, int src, int dst, int num)
sc->sc_old_ops.copyrows(cookie, src, dst, num);
ri->ri_bits = (void *)sc->sc_fb8bank1_vaddr;
sc->sc_old_ops.copyrows(cookie, src, dst, num);
+
+ return 0;
}
-void
+int
ifb_eraserows_dumb(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -903,13 +911,15 @@ ifb_eraserows_dumb(void *cookie, int row, int num, long attr)
sc->sc_old_ops.eraserows(cookie, row, num, attr);
ri->ri_bits = (void *)sc->sc_fb8bank1_vaddr;
sc->sc_old_ops.eraserows(cookie, row, num, attr);
+
+ return 0;
}
/* Similar to rasops_do_cursor(), but using a 7bit pixel mask. */
#define CURSOR_MASK 0x7f7f7f7f
-void
+int
ifb_do_cursor_dumb(struct rasops_info *ri)
{
struct ifb_softc *sc = ri->ri_hw;
@@ -982,13 +992,15 @@ ifb_do_cursor_dumb(struct rasops_info *ri)
}
}
}
+
+ return 0;
}
/*
* Accelerated routines.
*/
-void
+int
ifb_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -1002,9 +1014,11 @@ ifb_copycols(void *cookie, int row, int src, int dst, int num)
ifb_copyrect(sc, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
ifb_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -1019,9 +1033,11 @@ ifb_erasecols(void *cookie, int row, int col, int num, long attr)
ifb_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
ifb_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -1033,9 +1049,11 @@ ifb_copyrows(void *cookie, int src, int dst, int num)
ifb_copyrect(sc, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
ifb_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -1056,6 +1074,8 @@ ifb_eraserows(void *cookie, int row, int num, long attr)
w = ri->ri_emuwidth;
}
ifb_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
void
@@ -1207,7 +1227,7 @@ ifb_rop_wait(struct ifb_softc *sc)
return i;
}
-void
+int
ifb_do_cursor(struct rasops_info *ri)
{
struct ifb_softc *sc = ri->ri_hw;
@@ -1219,4 +1239,6 @@ ifb_do_cursor(struct rasops_info *ri)
ifb_rop(sc, x, y, x, y, ri->ri_font->fontwidth, ri->ri_font->fontheight,
IFB_ROP_XOR, IFB_PIXELMASK);
ifb_rop_wait(sc);
+
+ return 0;
}
diff --git a/sys/arch/sparc64/dev/machfb.c b/sys/arch/sparc64/dev/machfb.c
index 61dac6d2a2e..c27fd99041f 100644
--- a/sys/arch/sparc64/dev/machfb.c
+++ b/sys/arch/sparc64/dev/machfb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machfb.c,v 1.5 2009/06/05 19:16:08 kettenis Exp $ */
+/* $OpenBSD: machfb.c,v 1.6 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@@ -222,10 +222,10 @@ int machfb_getcmap(struct machfb_softc *, struct wsdisplay_cmap *);
int machfb_putcmap(struct machfb_softc *, struct wsdisplay_cmap *);
void machfb_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
-void machfb_copycols(void *, int, int, int, int);
-void machfb_erasecols(void *, int, int, int, long);
-void machfb_copyrows(void *, int, int, int);
-void machfb_eraserows(void *, int, int, long);
+int machfb_copycols(void *, int, int, int, int);
+int machfb_erasecols(void *, int, int, int, long);
+int machfb_copyrows(void *, int, int, int);
+int machfb_eraserows(void *, int, int, long);
void machfb_init(struct machfb_softc *);
int machfb_wait_fifo(struct machfb_softc *, int);
@@ -514,7 +514,7 @@ machfb_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
* Accelerated routines.
*/
-void
+int
machfb_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -528,9 +528,11 @@ machfb_copycols(void *cookie, int row, int src, int dst, int num)
machfb_copyrect(sc, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
machfb_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -545,9 +547,11 @@ machfb_erasecols(void *cookie, int row, int col, int num, long attr)
machfb_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
machfb_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -559,9 +563,11 @@ machfb_copyrows(void *cookie, int src, int dst, int num)
machfb_copyrect(sc, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
machfb_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -582,6 +588,8 @@ machfb_eraserows(void *cookie, int row, int num, long attr)
w = ri->ri_emuwidth;
}
machfb_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
void
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index 94405952402..9f738e358bc 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcons.c,v 1.13 2007/11/14 20:43:12 kettenis Exp $ */
+/* $OpenBSD: pcons.c,v 1.14 2009/09/05 14:09:35 miod Exp $ */
/* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */
/*-
@@ -559,7 +559,7 @@ void pcons_free_screen(void *, void *);
int pcons_ioctl(void *, u_long, caddr_t, int, struct proc *);
int pcons_mapchar(void *, int, unsigned int *);
paddr_t pcons_mmap(void *, off_t, int);
-void pcons_putchar(void *, int, int, u_int, long);
+int pcons_putchar(void *, int, int, u_int, long);
int pcons_show_screen(void *, void *, int, void (*)(void *, int, int),
void *);
@@ -664,7 +664,7 @@ pcons_mapchar(void *v, int uc, unsigned int *idx)
}
}
-void
+int
pcons_putchar(void *v, int row, int col, u_int uc, long attr)
{
u_char buf[1];
@@ -674,6 +674,8 @@ pcons_putchar(void *v, int row, int col, u_int uc, long attr)
s = splhigh();
OF_write(stdout, &buf, 1);
splx(s);
+
+ return 0;
}
void
diff --git a/sys/arch/sparc64/dev/radeonfb.c b/sys/arch/sparc64/dev/radeonfb.c
index 94056d17117..935c99191bf 100644
--- a/sys/arch/sparc64/dev/radeonfb.c
+++ b/sys/arch/sparc64/dev/radeonfb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeonfb.c,v 1.1 2009/07/05 17:13:25 kettenis Exp $ */
+/* $OpenBSD: radeonfb.c,v 1.2 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@@ -149,10 +149,10 @@ int radeonfb_getcmap(struct radeonfb_softc *, struct wsdisplay_cmap *);
int radeonfb_putcmap(struct radeonfb_softc *, struct wsdisplay_cmap *);
void radeonfb_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
-void radeonfb_copycols(void *, int, int, int, int);
-void radeonfb_erasecols(void *, int, int, int, long);
-void radeonfb_copyrows(void *, int, int, int);
-void radeonfb_eraserows(void *, int, int, long);
+int radeonfb_copycols(void *, int, int, int, int);
+int radeonfb_erasecols(void *, int, int, int, long);
+int radeonfb_copyrows(void *, int, int, int);
+int radeonfb_eraserows(void *, int, int, long);
void radeonfb_wait_fifo(struct radeonfb_softc *, int);
void radeonfb_wait(struct radeonfb_softc *);
@@ -463,7 +463,7 @@ radeonfb_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
* Accelerated routines.
*/
-void
+int
radeonfb_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -477,9 +477,11 @@ radeonfb_copycols(void *cookie, int row, int src, int dst, int num)
radeonfb_copyrect(sc, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
radeonfb_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -494,9 +496,11 @@ radeonfb_erasecols(void *cookie, int row, int col, int num, long attr)
radeonfb_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
radeonfb_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -508,9 +512,11 @@ radeonfb_copyrows(void *cookie, int src, int dst, int num)
radeonfb_copyrect(sc, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
radeonfb_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -531,6 +537,8 @@ radeonfb_eraserows(void *cookie, int row, int num, long attr)
w = ri->ri_emuwidth;
}
radeonfb_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
void
diff --git a/sys/arch/sparc64/dev/raptor.c b/sys/arch/sparc64/dev/raptor.c
index 9bc2e31751d..834c3aa1428 100644
--- a/sys/arch/sparc64/dev/raptor.c
+++ b/sys/arch/sparc64/dev/raptor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raptor.c,v 1.5 2009/03/12 19:10:22 kettenis Exp $ */
+/* $OpenBSD: raptor.c,v 1.6 2009/09/05 14:09:35 miod Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@@ -161,10 +161,10 @@ int raptor_getcmap(struct raptor_softc *, struct wsdisplay_cmap *);
int raptor_putcmap(struct raptor_softc *, struct wsdisplay_cmap *);
void raptor_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
-void raptor_copycols(void *, int, int, int, int);
-void raptor_erasecols(void *, int, int, int, long);
-void raptor_copyrows(void *, int, int, int);
-void raptor_eraserows(void *, int, int, long);
+int raptor_copycols(void *, int, int, int, int);
+int raptor_erasecols(void *, int, int, int, long);
+int raptor_copyrows(void *, int, int, int);
+int raptor_eraserows(void *, int, int, long);
void raptor_init(struct raptor_softc *);
int raptor_wait(struct raptor_softc *);
@@ -428,7 +428,7 @@ raptor_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
* Accelerated routines.
*/
-void
+int
raptor_copycols(void *cookie, int row, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -442,9 +442,11 @@ raptor_copycols(void *cookie, int row, int src, int dst, int num)
raptor_copyrect(sc, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
num, ri->ri_font->fontheight);
+
+ return 0;
}
-void
+int
raptor_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -459,9 +461,11 @@ raptor_erasecols(void *cookie, int row, int col, int num, long attr)
raptor_fillrect(sc, ri->ri_xorigin + col, ri->ri_yorigin + row,
num, ri->ri_font->fontheight, ri->ri_devcmap[bg]);
+
+ return 0;
}
-void
+int
raptor_copyrows(void *cookie, int src, int dst, int num)
{
struct rasops_info *ri = cookie;
@@ -473,9 +477,11 @@ raptor_copyrows(void *cookie, int src, int dst, int num)
raptor_copyrect(sc, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst, ri->ri_emuwidth, num);
+
+ return 0;
}
-void
+int
raptor_eraserows(void *cookie, int row, int num, long attr)
{
struct rasops_info *ri = cookie;
@@ -496,6 +502,8 @@ raptor_eraserows(void *cookie, int row, int num, long attr)
w = ri->ri_emuwidth;
}
raptor_fillrect(sc, x, y, w, num, ri->ri_devcmap[bg]);
+
+ return 0;
}
void
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;
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 13:43:35 +0000