[src/trunk]: src/sys/dev/sbus adjust some mmap ranges so X can work, also use...

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

details:   https://anonhg.NetBSD.org/src/rev/39c805e773e6
branches:  trunk
changeset: 746988:39c805e773e6
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Aug 26 22:36:07 2009 +0000

description:
adjust some mmap ranges so X can work, also use FBTYPE_TCXCOLOR

diffstat:

 sys/dev/sbus/tcx.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r bd33a8abee1c -r 39c805e773e6 sys/dev/sbus/tcx.c
--- a/sys/dev/sbus/tcx.c        Wed Aug 26 22:34:50 2009 +0000
+++ b/sys/dev/sbus/tcx.c        Wed Aug 26 22:36:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $ */
+/*     $NetBSD: tcx.c,v 1.40 2009/08/26 22:36:07 macallan Exp $ */
 
 /*
  *  Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.40 2009/08/26 22:36:07 macallan Exp $");
 
 /*
  * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -273,11 +273,11 @@
 
        fb->fb_type.fb_cmsize = 256;
        fb->fb_type.fb_size = ramsize;
-       printf(": %s, %d x %d", OBPNAME,
+       printf("%s: %s, %d x %d", device_xname(self), OBPNAME,
                fb->fb_type.fb_width,
                fb->fb_type.fb_height);
 
-       fb->fb_type.fb_type = FBTYPE_SUNTCX;
+       fb->fb_type.fb_type = FBTYPE_TCXCOLOR;
 
 
        if (sa->sa_nreg != TCX_NREG) {
@@ -619,7 +619,7 @@
                { TCX_USER_RBLIT, 1, TCX_REG_RBLIT },
                { TCX_USER_TEC, 1, TCX_REG_TEC },
                { TCX_USER_BTREGS, 8192 /* XXX */, TCX_REG_CMAP },
-               { TCX_USER_THC, 0x1000, TCX_REG_THC },
+               { TCX_USER_THC, 0x2000, TCX_REG_THC },
                { TCX_USER_DHC, 1, TCX_REG_DHC },
                { TCX_USER_ALT, 1, TCX_REG_ALT },
                { TCX_USER_ROM, 65536, TCX_REG_ROM },
@@ -645,8 +645,10 @@
        for (; mo < mo_end; mo++) {
                if ((u_int)off < mo->mo_uaddr)
                        continue;
+
                u = off - mo->mo_uaddr;
                sz = mo->mo_size;
+
                if (sz == 0) {
                        sz = sc->sc_fb.fb_type.fb_size;
                        /*
@@ -664,6 +666,9 @@
                                sz *= 4;
                        }
                }
+               if (sz == 1)
+                       sz = rr[mo->mo_bank].oa_size;
+
                if (u < sz) {
                        return (bus_space_mmap(sc->sc_bustag,
                                BUS_ADDR(rr[mo->mo_bank].oa_space,