From 40a8bc1d342f83744265fef7c1218b42e8ab2e12 Mon Sep 17 00:00:00 2001
From: uwe <uwe@NetBSD.org>
Date: Tue, 12 Mar 2002 00:32:30 +0000
Subject: [PATCH] Drop ebus_bus_map(), use plain bus_space_map() instead.

---
 sys/arch/sparc/dev/com_ebus.c | 10 +++++-----
 sys/arch/sparc/dev/rtc.c      |  6 +++---
 sys/dev/ebus/ebusvar.h        |  5 +----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sys/arch/sparc/dev/com_ebus.c b/sys/arch/sparc/dev/com_ebus.c
index 8bf4f198de9e..805bec3a1392 100644
--- a/sys/arch/sparc/dev/com_ebus.c
+++ b/sys/arch/sparc/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ebus.c,v 1.2 2002/02/18 04:52:26 uwe Exp $ */
+/*	$NetBSD: com_ebus.c,v 1.3 2002/03/12 00:32:30 uwe Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -81,8 +81,8 @@ com_ebus_match(parent, cf, aux)
 		return (0);
 
 	match = 0;
-	if (ebus_bus_map(ea->ea_bustag, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
-			 ea->ea_reg[0].size, 0, 0, &ioh) == 0)
+	if (bus_space_map(ea->ea_bustag, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
+			  ea->ea_reg[0].size, 0, &ioh) == 0)
 	{
 		match = comprobe1(ea->ea_bustag, ioh);
 		bus_space_unmap(ea->ea_bustag, ioh, ea->ea_reg[0].size);
@@ -114,8 +114,8 @@ com_ebus_attach(parent, self, aux)
 			    B9600, sc->sc_frequency, (CLOCAL | CREAD | CS8));
 
 	if (!com_is_console(sc->sc_iot, sc->sc_iobase, &sc->sc_ioh)
-	    && ebus_bus_map(sc->sc_iot, sc->sc_iobase, ea->ea_reg[0].size,
-			    0, 0, &sc->sc_ioh) != 0)
+	    && bus_space_map(sc->sc_iot, sc->sc_iobase, ea->ea_reg[0].size,
+			     0, &sc->sc_ioh) != 0)
 	{
 		printf(": unable to map device registers\n");
 		return;
diff --git a/sys/arch/sparc/dev/rtc.c b/sys/arch/sparc/dev/rtc.c
index 4692450e5753..01f5fd8d10e6 100644
--- a/sys/arch/sparc/dev/rtc.c
+++ b/sys/arch/sparc/dev/rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtc.c,v 1.2 2002/02/18 04:52:26 uwe Exp $ */
+/*	$NetBSD: rtc.c,v 1.3 2002/03/12 00:32:30 uwe Exp $ */
 
 /*
  * Copyright (c) 2001 Valeriy E. Ushakov
@@ -131,8 +131,8 @@ rtcattach_ebus(parent, self, aux)
 	todr_chip_handle_t handle;
 
 	sc->sc_bt = ea->ea_bustag;
-	if (ebus_bus_map(sc->sc_bt, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
-			 ea->ea_reg[0].size, 0, 0, &sc->sc_bh) != 0)
+	if (bus_space_map(sc->sc_bt, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
+			  ea->ea_reg[0].size, 0, &sc->sc_bh) != 0)
 	{
 		printf(": can't map registers\n", self->dv_xname);
 		return;
diff --git a/sys/dev/ebus/ebusvar.h b/sys/dev/ebus/ebusvar.h
index 7b540ad4826a..da49bc2634f2 100644
--- a/sys/dev/ebus/ebusvar.h
+++ b/sys/dev/ebus/ebusvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebusvar.h,v 1.1 2002/02/18 04:44:41 uwe Exp $ */
+/*	$NetBSD: ebusvar.h,v 1.2 2002/03/12 00:32:30 uwe Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -52,7 +52,4 @@ struct ebus_attach_args {
 	int			ea_nintr;
 };
 
-#define ebus_bus_map(t, a, s, f, v, hp) \
-	bus_space_map2(t, 0, a, s, f, v, hp)
-
 #endif /* _DEV_EBUS_EBUSVAR_H_ */