From 23b3d8fa7d5fa86e505f66ddf640571617521aba Mon Sep 17 00:00:00 2001 From: Jason Wright Date: Fri, 27 Jun 2003 00:27:19 +0000 Subject: Don't need LINEAR mappings. --- sys/dev/sbus/apio.c | 26 ++++++++++---------------- sys/dev/sbus/asio.c | 18 +++++++----------- sys/dev/sbus/spif.c | 4 ++-- 3 files changed, 19 insertions(+), 29 deletions(-) (limited to 'sys') diff --git a/sys/dev/sbus/apio.c b/sys/dev/sbus/apio.c index 808fd3d62e0..a237dec08d2 100644 --- a/sys/dev/sbus/apio.c +++ b/sys/dev/sbus/apio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apio.c,v 1.5 2003/06/24 21:54:38 henric Exp $ */ +/* $OpenBSD: apio.c,v 1.6 2003/06/27 00:27:18 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -127,29 +127,23 @@ apio_attach(parent, self, aux) return; } - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[0].sbr_slot, - sa->sa_reg[0].sbr_offset, - sa->sa_reg[0].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_csr_h)) { + if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot, + sa->sa_reg[0].sbr_offset, sa->sa_reg[0].sbr_size, + 0, 0, &sc->sc_csr_h)) { printf(": couldn't map csr\n"); return; } - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[1].sbr_slot, - sa->sa_reg[1].sbr_offset, - sa->sa_reg[1].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_clk_h)) { + if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[1].sbr_slot, + sa->sa_reg[1].sbr_offset, sa->sa_reg[1].sbr_size, + 0, 0, &sc->sc_clk_h)) { printf(": couldn't map clk\n"); return; } - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[2].sbr_slot, - sa->sa_reg[2].sbr_offset, - sa->sa_reg[2].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_lpt_h)) { + if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[2].sbr_slot, + sa->sa_reg[2].sbr_offset, sa->sa_reg[2].sbr_size, + 0, 0, &sc->sc_lpt_h)) { printf(": couldn't map clk\n"); return; } diff --git a/sys/dev/sbus/asio.c b/sys/dev/sbus/asio.c index 1c7b9eb29c1..81270caa071 100644 --- a/sys/dev/sbus/asio.c +++ b/sys/dev/sbus/asio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asio.c,v 1.8 2003/06/24 21:54:38 henric Exp $ */ +/* $OpenBSD: asio.c,v 1.9 2003/06/27 00:27:18 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -136,21 +136,17 @@ asio_attach(parent, self, aux) return; } - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[0].sbr_slot, - sa->sa_reg[0].sbr_offset, - sa->sa_reg[0].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_csr_h)) { + if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot, + sa->sa_reg[0].sbr_offset, sa->sa_reg[0].sbr_size, + 0, 0, &sc->sc_csr_h)) { printf(": couldn't map csr\n"); return; } for (i = 0; i < sc->sc_nports; i++) { - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[i + 1].sbr_slot, - sa->sa_reg[i + 1].sbr_offset, - sa->sa_reg[i + 1].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_ports[i].ap_bh)) { + if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[i + 1].sbr_slot, + sa->sa_reg[i + 1].sbr_offset, sa->sa_reg[i + 1].sbr_size, + 0, 0, &sc->sc_ports[i].ap_bh)) { printf(": couldn't map uart%d\n", i); return; } diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index b843270d029..8175fd26cb7 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spif.c,v 1.8 2003/06/24 21:54:38 henric Exp $ */ +/* $OpenBSD: spif.c,v 1.9 2003/06/27 00:27:17 jason Exp $ */ /* * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net) @@ -186,7 +186,7 @@ spifattach(parent, self, aux) sc->sc_bustag = sa->sa_bustag; if (sbus_bus_map(sa->sa_bustag, sa->sa_reg[0].sbr_slot, sa->sa_reg[0].sbr_offset, sa->sa_reg[0].sbr_size, - BUS_SPACE_MAP_LINEAR, 0, &sc->sc_regh) != 0) { + 0, 0, &sc->sc_regh) != 0) { printf(": can't map registers\n"); return; } -- cgit v1.2.3