 @@ -1,17 +1,17 @@
-/*	$NetBSD: r128fb.c,v 1.35 2012/05/23 18:39:30 macallan Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.36 2012/10/04 10:22:45 macallan Exp $	*/
 /*
- * Copyright (c) 2007 Michael Lorenz
+ * Copyright (c) 2007, 2012 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -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.35 2012/05/23 18:39:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.36 2012/10/04 10:22:45 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>
 @@ -217,27 +217,27 @@ r128fb_attach(device_t parent, device_t
 	/* fill in parameters from properties */
 	dict = device_properties(self);
 	if (!prop_dictionary_get_uint32(dict, "width", &sc->sc_width)) {
 		aprint_error("%s: no width property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "height", &sc->sc_height)) {
 		aprint_error("%s: no height property\n", device_xname(self));
 		return;
+	}
 #ifdef GLYPHCACHE_DEBUG
 	/* leave some visible VRAM unused so we can see the glyph cache */
-	sc->sc_height -= 100;
+	sc->sc_height -= 200;
 #endif
 	if (!prop_dictionary_get_uint32(dict, "depth", &sc->sc_depth)) {
 		aprint_error("%s: no depth property\n", device_xname(self));
 		return;
+	}
 	if (!prop_dictionary_get_uint32(dict, "linebytes", &sc->sc_stride)) {
 		aprint_error("%s: no linebytes property\n",
 		    device_xname(self));
 		return;
+	}
 	prop_dictionary_get_bool(dict, "is_console", &is_console);
 @@ -369,27 +369,28 @@ r128fb_ioctl(void *v, void *vs, u_long c
 	switch (cmd) {
 	case WSDISPLAYIO_GTYPE:
 		*(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
 		return 0;
 	/* PCI config read/write passthrough. */
 	case PCI_IOC_CFGREAD:
 	case PCI_IOC_CFGWRITE:
 		return pci_devioctl(sc->sc_pc, sc->sc_pcitag,
 		    cmd, data, flag, l);
 	case WSDISPLAYIO_GET_BUSID:
-		return wsdisplayio_busid_pci(sc->sc_dev, sc->sc_pc, sc->sc_pcitag, data);
+		return wsdisplayio_busid_pci(sc->sc_dev, sc->sc_pc,
 		    sc->sc_pcitag, data);
 	case WSDISPLAYIO_GINFO:
 		if (ms == NULL)
 			return ENODEV;
 		wdf = (void *)data;
 		wdf->height = ms->scr_ri.ri_height;
 		wdf->width = ms->scr_ri.ri_width;
 		wdf->depth = ms->scr_ri.ri_depth;
 		wdf->cmsize = 256;
 		return 0;
 	case WSDISPLAYIO_GETCMAP:
 		return r128fb_getcmap(sc,
 @@ -539,28 +540,26 @@ r128fb_init_screen(void *cookie, struct
 #endif
 	rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
 		    sc->sc_width / ri->ri_font->fontwidth);
 	ri->ri_hw = scr;
 	ri->ri_ops.copyrows = r128fb_copyrows;
 	ri->ri_ops.copycols = r128fb_copycols;
 	ri->ri_ops.eraserows = r128fb_eraserows;
 	ri->ri_ops.erasecols = r128fb_erasecols;
 	ri->ri_ops.cursor = r128fb_cursor;
 	if (FONT_IS_ALPHA(ri->ri_font)) {
 		ri->ri_ops.putchar = r128fb_putchar_aa;
 		ri->ri_ops.allocattr(ri, WS_DEFAULT_FG, WS_DEFAULT_BG,
 , &sc->sc_gc.gc_attr);
 	} else
 		ri->ri_ops.putchar = r128fb_putchar;
+}
 static int
 r128fb_putcmap(struct r128fb_softc *sc, struct wsdisplay_cmap *cm)
+{
 	u_char *r, *g, *b;
 	u_int index = cm->index;
 	u_int count = cm->count;
 	int i, error;
 	u_char rbuf[256], gbuf[256], bbuf[256];