[src/trunk]: src/sys/dev/pci don't call allocattr() for the default attribute

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c8567cb0b5b1
branches:  trunk
changeset: 781859:c8567cb0b5b1
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Oct 04 10:22:45 2012 +0000

description:
don't call allocattr() for the default attribute

diffstat:

 sys/dev/pci/r128fb.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 58e07b300813 -r c8567cb0b5b1 sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c      Thu Oct 04 00:14:24 2012 +0000
+++ b/sys/dev/pci/r128fb.c      Thu Oct 04 10:22:45 2012 +0000
@@ -1,7 +1,7 @@
-/*     $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
@@ -31,7 +31,7 @@
  */
 
 #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>
@@ -227,7 +227,7 @@
 
 #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)) {
@@ -379,7 +379,8 @@
                    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)
@@ -549,8 +550,6 @@
        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,
-                    0, &sc->sc_gc.gc_attr);
        } else
                ri->ri_ops.putchar = r128fb_putchar;
 }