diff options
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/vsa/gpx.c | 7 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/smg.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/vax/vsa/gpx.c b/sys/arch/vax/vsa/gpx.c index 7e8bc47b617..b39e1f6c652 100644 --- a/sys/arch/vax/vsa/gpx.c +++ b/sys/arch/vax/vsa/gpx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpx.c,v 1.15 2006/11/29 12:13:54 miod Exp $ */ +/* $OpenBSD: gpx.c,v 1.16 2006/11/29 19:08:22 miod Exp $ */ /* * Copyright (c) 2006 Miodrag Vallat. * @@ -503,7 +503,7 @@ gpx_putchar(void *v, int row, int col, u_int uc, long attr) struct wsdisplay_font *font = ri->ri_font; int dx, dy, sx, sy, fg, bg, ul; - rasops_unpack_attr(attr, &fg, &bg, &ul); + ri->ri_ops.unpack_attr(v, attr, &fg, &bg, &ul); /* find where to output the glyph... */ dx = col * font->fontwidth + ri->ri_xorigin; @@ -1063,9 +1063,10 @@ void gpx_fillrect(struct gpx_screen *ss, int x, int y, int dx, int dy, long attr, u_int function) { + struct rasops_info *ri = &ss->ss_ri; int fg, bg; - rasops_unpack_attr(attr, &fg, &bg, NULL); + ri->ri_ops.unpack_attr(ri, attr, &fg, &bg, NULL); while (gpx_viper_write(ss, CS_UPDATE_MASK, 0x00ff)); gpx_viper_write(ss, MASK_1, 0xffff); diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c index 2c7a288b627..67c66093edb 100644 --- a/sys/arch/vax/vsa/smg.c +++ b/sys/arch/vax/vsa/smg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smg.c,v 1.18 2006/11/29 12:13:54 miod Exp $ */ +/* $OpenBSD: smg.c,v 1.19 2006/11/29 19:08:22 miod Exp $ */ /* $NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */ /* * Copyright (c) 2006, Miodrag Vallat @@ -796,7 +796,7 @@ smg_erasecols(void *cookie, int row, int col, int num, long attr) struct rasops_info *ri = cookie; int fg, bg; - rasops_unpack_attr(attr, &fg, &bg, NULL); + ri->ri_ops.unpack_attr(cookie, attr, &fg, &bg, NULL); num *= ri->ri_font->fontwidth; col *= ri->ri_font->fontwidth; |