 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fb.c,v 1.25 2012/01/04 08:38:20 macallan Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $	*/
 /*
  * Copyright (c) 2007 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for ATI Rage 128 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.25 2012/01/04 08:38:20 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -815,50 +815,48 @@ r128fb_cursor(void *cookie, int on, int
+	}
+}
 static void
 r128fb_putchar(void *cookie, int row, int col, u_int c, long attr)
+{
 	struct rasops_info *ri = cookie;
 	struct wsdisplay_font *font = PICK_FONT(ri, c);
 	struct vcons_screen *scr = ri->ri_hw;
 	struct r128fb_softc *sc = scr->scr_cookie;
 	void *data;
 	uint32_t fg, bg;
-	int uc, i;
+	int i, x, y, wi, he, offset;
 	int x, y, wi, he, offset;
 	if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL)
 		return;
 	if (!CHAR_IN_FONT(c, font))
 		return;
 	wi = font->fontwidth;
 	he = font->fontheight;
 	bg = ri->ri_devcmap[(attr >> 16) & 0xf];
 	fg = ri->ri_devcmap[(attr >> 24) & 0xf];
 	x = ri->ri_xorigin + col * wi;
 	y = ri->ri_yorigin + row * he;
 	if (c == 0x20) {
 		r128fb_rectfill(sc, x, y, wi, he, bg);
 		return;
+	}
-	uc = c - font->firstchar;
+	data = WSFONT_GLYPH(c, font);
 	data = (uint8_t *)font->data + uc * ri->ri_fontscale;
 	r128fb_wait(sc, 8);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh,
 	    R128_DP_GUI_MASTER_CNTL,
 	    R128_GMC_BRUSH_SOLID_COLOR |
 	    R128_GMC_SRC_DATATYPE_MONO_FG_BG |
 	    R128_ROP3_S |
 	    R128_DP_SRC_SOURCE_HOST_DATA |
 	    R128_GMC_DST_CLIPPING |
 	    sc->sc_master_cntl);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh,
 @@ -916,49 +914,48 @@ r128fb_putchar(void *cookie, int row, in
 			break;
+		}
+	}
+}
 static void
 r128fb_putchar_aa(void *cookie, int row, int col, u_int c, long attr)
+{
 	struct rasops_info *ri = cookie;
 	struct wsdisplay_font *font = PICK_FONT(ri, c);
 	struct vcons_screen *scr = ri->ri_hw;
 	struct r128fb_softc *sc = scr->scr_cookie;
 	uint32_t bg, latch = 0, bg8, fg8, pixel;
-	int uc, i, x, y, wi, he, r, g, b, aval;
+	int i, x, y, wi, he, r, g, b, aval;
 	int r1, g1, b1, r0, g0, b0, fgo, bgo;
 	uint8_t *data8;
 	if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL)
 		return;
 	if (!CHAR_IN_FONT(c, font))
 		return;
 	wi = font->fontwidth;
 	he = font->fontheight;
 	bg = ri->ri_devcmap[(attr >> 16) & 0xf];
 	x = ri->ri_xorigin + col * wi;
 	y = ri->ri_yorigin + row * he;
 	if (c == 0x20) {
 		r128fb_rectfill(sc, x, y, wi, he, bg);
 		return;
+	}
-	uc = c - font->firstchar;
+	data8 = WSFONT_GLYPH(c, font);
 	data8 = (uint8_t *)font->data + uc * ri->ri_fontscale;
 	r128fb_wait(sc, 5);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh,
 	    R128_DP_GUI_MASTER_CNTL,
 	    R128_GMC_BRUSH_SOLID_COLOR |
 	    R128_GMC_SRC_DATATYPE_COLOR |
 	    R128_ROP3_S |
 	    R128_DP_SRC_SOURCE_HOST_DATA |
 	    sc->sc_master_cntl);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh,
 	    R128_DP_CNTL,
 	    R128_DST_Y_TOP_TO_BOTTOM |

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeonfb.c,v 1.49 2012/01/03 00:25:49 macallan Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.50 2012/01/04 15:56:18 macallan Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -60,27 +60,27 @@
  * portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, VA LINUX SYSTEMS AND/OR
  * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.49 2012/01/03 00:25:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.50 2012/01/04 15:56:18 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 @@ -2422,27 +2422,27 @@ radeonfb_putchar(void *cookie, int row,
 	w = font->fontwidth;
 	h = font->fontheight;
 	bg = ri->ri_devcmap[(attr >> 16) & 0xf];
 	fg = ri->ri_devcmap[(attr >> 24) & 0xf];
 	xd = ri->ri_xorigin + col * w;
 	yd = ri->ri_yorigin + row * h;
 	if (c == 0x20) {
 		radeonfb_rectfill(dp, xd, yd, w, h, bg);
 		return;
+	}
-	data = (uint8_t *)font->data + (c - font->firstchar) * ri->ri_fontscale;
+	data = WSFONT_GLYPH(c, font);
 	gmc = dp->rd_format << RADEON_GMC_DST_DATATYPE_SHIFT;
 	radeonfb_wait_fifo(sc, 9);
 	PUT32(sc, RADEON_DP_GUI_MASTER_CNTL,
 	    RADEON_GMC_BRUSH_NONE |
 	    RADEON_GMC_SRC_DATATYPE_MONO_FG_BG |
 	    RADEON_GMC_DST_CLIPPING |
 	    RADEON_ROP3_S |
 	    RADEON_DP_SRC_SOURCE_HOST_DATA |
 	    RADEON_GMC_CLR_CMP_CNTL_DIS |
 	    RADEON_GMC_WR_MSK_DIS |
 @@ -2511,27 +2511,27 @@ radeonfb_putchar_aa32(void *cookie, int
 	w = font->fontwidth;
 	h = font->fontheight;
 	bg = ri->ri_devcmap[(attr >> 16) & 0xf];
 	fg = ri->ri_devcmap[(attr >> 24) & 0xf];
 	xd = ri->ri_xorigin + col * w;
 	yd = ri->ri_yorigin + row * h;
 	if (c == 0x20) {
 		radeonfb_rectfill(dp, xd, yd, w, h, bg);
 		return;
+	}
-	data = (uint8_t *)font->data + (c - font->firstchar) * ri->ri_fontscale;
+	data = WSFONT_GLYPH(c, font);
 	gmc = dp->rd_format << RADEON_GMC_DST_DATATYPE_SHIFT;
 	radeonfb_wait_fifo(sc, 5);
 	PUT32(sc, RADEON_DP_GUI_MASTER_CNTL,
 	    RADEON_GMC_BRUSH_NONE |
 	    RADEON_GMC_SRC_DATATYPE_COLOR |
 	    RADEON_ROP3_S |
 	    RADEON_DP_SRC_SOURCE_HOST_DATA |
 	    RADEON_GMC_CLR_CMP_CNTL_DIS |
 	    RADEON_GMC_WR_MSK_DIS |
 	    gmc);