Module Name: src
Committed By: macallan
Date: Tue May 26 03:32:51 UTC 2009
Modified Files:
src/sys/dev/sbus: agten.c cgsix_sbus.c zx.c
Log Message:
use BUS_SPACE_MAP_LARGE
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sbus/agten.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sbus/cgsix_sbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/zx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.18 src/sys/dev/sbus/agten.c:1.19
--- src/sys/dev/sbus/agten.c:1.18 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/agten.c Tue May 26 03:32:51 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -27,7 +27,7 @@
*/
#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
@@ -245,9 +245,10 @@
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");
Index: src/sys/dev/sbus/cgsix_sbus.c
diff -u src/sys/dev/sbus/cgsix_sbus.c:1.28 src/sys/dev/sbus/cgsix_sbus.c:1.29
--- src/sys/dev/sbus/cgsix_sbus.c:1.28 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/cgsix_sbus.c Tue May 26 03:32:51 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -34,7 +34,7 @@
*/
#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>
@@ -186,7 +186,8 @@
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;
}
Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.29 src/sys/dev/sbus/zx.c:1.30
--- src/sys/dev/sbus/zx.c:1.29 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/zx.c Tue May 26 03:32:51 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -45,7 +45,7 @@
*/
#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>
@@ -229,8 +229,8 @@
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,
- 0x800000, BUS_SPACE_MAP_LINEAR, &bh) != 0) {
+ if (sbus_bus_map(bt, sa->sa_slot, sa->sa_offset + ZX_OFF_SS0,
+ 0x800000, BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE, &bh) != 0) {
aprint_error_dev(self, "can't map bits\n");
return;
}
