 @@ -1,14 +1,14 @@
-/*	$NetBSD: agten.c,v 1.18 2009/05/12 13:20:05 cegger Exp $ */
+/*	$NetBSD: agten.c,v 1.19 2009/05/26 03:32:51 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.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.18 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.19 2009/05/26 03:32:51 macallan Exp $");
 /*
  * a driver for the Fujitsu AG-10e SBus framebuffer
+ *
  * this thing is Frankenstein's Monster among graphics boards.
  * it contains three graphics chips:
  * a GLint - 24bit stuff, double-buffered
  * an Imagine 128 which provides an 8bit overlay
  * a Weitek P9100 which provides WIDs
  * so here we need to mess only with the P9100 and the I128 - for X we just
  * hide the overlay and let the Xserver mess with the GLint
  */
 @@ -235,29 +235,30 @@ agten_attach(device_t parent, device_t d
 	sc->sc_screenlist = (struct wsscreen_list){1, sc->sc_screens};
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 	sc->sc_fb_is_open = 0;
 	sc->sc_video = -1;
 	sc->sc_bustag = sa->sa_bustag;
 	sc->sc_width = prom_getpropint(node, "ffb_width", 1152);
 	sc->sc_height = prom_getpropint(node, "ffb_height", 900);
 	sc->sc_depth = prom_getpropint(node, "ffb_depth", 8);
 	sc->sc_stride = sc->sc_width * (sc->sc_depth >> 3);
 	reg = prom_getpropint(node, "i128_fb_physaddr", -1);
 	sc->sc_i128_fbsz = prom_getpropint(node, "i128_fb_size", -1);
-	if (sparc_bus_map_large(sc->sc_bustag,
+	if (sbus_bus_map(sc->sc_bustag,
 	    sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base + reg,
-	    sc->sc_stride * sc->sc_height, BUS_SPACE_MAP_LINEAR,
+	    sc->sc_stride * sc->sc_height,
 	    BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
 	    &sc->sc_i128_fbh) != 0) {
 		aprint_error_dev(dev, "unable to map the framebuffer\n");
 		return;
+	}
 	fb->fb_pixels = bus_space_vaddr(sc->sc_bustag, sc->sc_i128_fbh);
 	reg = prom_getpropint(node, "i128_reg_physaddr", -1);
 	if (sbus_bus_map(sc->sc_bustag,
 	    sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base + reg,
 x10000, 0, &sc->sc_i128_regh) != 0) {
 		aprint_error_dev(dev, "unable to map I128 registers\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cgsix_sbus.c,v 1.28 2009/05/12 13:20:05 cegger Exp $ */
+/*	$NetBSD: cgsix_sbus.c,v 1.29 2009/05/26 03:32:51 macallan Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT 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.
  */
 /*
  * color display (cgsix) driver; Sbus bus front-end.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.28 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.29 2009/05/26 03:32:51 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #ifdef DEBUG
 #include <sys/proc.h>
 @@ -176,21 +176,22 @@ cgsixattach(device_t parent, device_t se
 	name = prom_getpropstring(node, "model");
 	isconsole = fb_is_console(node);
 	/*
 	 * we need the address of the framebuffer, no matter if we're console or
 	 * not.
 	 */
 	sc->sc_ramsize = prom_getpropint(node, "fbmapped", 1024 * 1024);
 	if (sbus_bus_map(sa->sa_bustag,
 			sa->sa_slot,
 			sa->sa_offset + CGSIX_RAM_OFFSET,
 			sc->sc_ramsize,
-			BUS_SPACE_MAP_LINEAR, &bh) != 0) {
+			BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
 			&bh) != 0) {
 		aprint_error_dev(self, "cannot map pixels\n");
 		return;
+	}
 	sc->sc_fb.fb_pixels = (void *)bus_space_vaddr(sa->sa_bustag, bh);
 	cg6attach(sc, name, isconsole);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zx.c,v 1.29 2009/05/12 13:20:06 cegger Exp $	*/
+/*	$NetBSD: zx.c,v 1.30 2009/05/26 03:32:51 macallan Exp $	*/
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
  *  All rights reserved.
+ *
  *  This code is derived from software contributed to The NetBSD Foundation
  *  by Andrew Doran.
+ *
  *  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.
 @@ -35,27 +35,27 @@
  * drivers were used as "living documentation" when writing this; thanks
  * to the authors.
+ *
  * Issues (which can be solved with wscons, happily enough):
+ *
  * o There is lots of unnecessary mucking about rasops in here, primarily
  *   to appease the sparc fb code.
+ *
  * o RASTERCONSOLE is required.  X needs the board set up correctly, and
  *   that's difficult to reconcile with using the PROM for output.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.29 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.30 2009/05/26 03:32:51 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/syslog.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 @@ -219,28 +219,28 @@ zx_attach(device_t parent, device_t self
 	unsigned long defattr;
 #endif
 	int isconsole, width, height;
 	sc = device_private(self);
 	sc->sc_dv = self;
 	sa = args;
 	fb = &sc->sc_fb;
 	bt = sa->sa_bustag;
 	sc->sc_bt = bt;
 	sc->sc_paddr = sbus_bus_addr(bt, sa->sa_slot, sa->sa_offset);
-	if (sparc_bus_map_large(bt, sa->sa_slot, sa->sa_offset + ZX_OFF_SS0,
+	if (sbus_bus_map(bt, sa->sa_slot, sa->sa_offset + ZX_OFF_SS0,
-x800000, BUS_SPACE_MAP_LINEAR, &bh) != 0) {
+x800000, BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE, &bh) != 0) {
 		aprint_error_dev(self, "can't map bits\n");
 		return;
+	}
 	fb->fb_pixels = (void *)bus_space_vaddr(bt, bh);
 	sc->sc_pixels = (u_int32_t *)fb->fb_pixels;
 	if (sbus_bus_map(bt, sa->sa_slot, sa->sa_offset + ZX_OFF_LC_SS0_USR,
 	    PAGE_SIZE, BUS_SPACE_MAP_LINEAR, &bh) != 0) {
 		aprint_error_dev(self, "can't map zc\n");
 		return;
+	}
 	sc->sc_bhzc = bh;