Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop ebus_bus_map(), use plain bus_space_map() instead.

Browse Source
This commit is contained in:
uwe 2002-03-12 00:32:30 +00:00
parent 4df483e009
commit 40a8bc1d34
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/sparc/dev/com_ebus.c
View File

@ -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. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -81,8 +81,8 @@ com_ebus_match(parent, cf, aux)
return (0); return (0);
match = 0; match = 0;
if (ebus_bus_map(ea->ea_bustag, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]), if (bus_space_map(ea->ea_bustag, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
ea->ea_reg[0].size, 0, 0, &ioh) == 0) ea->ea_reg[0].size, 0, &ioh) == 0)
{ {
match = comprobe1(ea->ea_bustag, ioh); match = comprobe1(ea->ea_bustag, ioh);
bus_space_unmap(ea->ea_bustag, ioh, ea->ea_reg[0].size); 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)); B9600, sc->sc_frequency, (CLOCAL | CREAD | CS8));
if (!com_is_console(sc->sc_iot, sc->sc_iobase, &sc->sc_ioh) 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, && bus_space_map(sc->sc_iot, sc->sc_iobase, ea->ea_reg[0].size,
0, 0, &sc->sc_ioh) != 0) 0, &sc->sc_ioh) != 0)
{ {
printf(": unable to map device registers\n"); printf(": unable to map device registers\n");
return; return;

6
sys/arch/sparc/dev/rtc.c
View File

@ -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 * Copyright (c) 2001 Valeriy E. Ushakov
@ -131,8 +131,8 @@ rtcattach_ebus(parent, self, aux)
todr_chip_handle_t handle; todr_chip_handle_t handle;
sc->sc_bt = ea->ea_bustag; sc->sc_bt = ea->ea_bustag;
if (ebus_bus_map(sc->sc_bt, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]), if (bus_space_map(sc->sc_bt, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
ea->ea_reg[0].size, 0, 0, &sc->sc_bh) != 0) ea->ea_reg[0].size, 0, &sc->sc_bh) != 0)
{ {
printf(": can't map registers\n", self->dv_xname); printf(": can't map registers\n", self->dv_xname);
return; return;

5
sys/dev/ebus/ebusvar.h
View File

@ -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 * Copyright (c) 1999, 2000 Matthew R. Green
@ -52,7 +52,4 @@ struct ebus_attach_args {
int ea_nintr; 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_ */ #endif /* _DEV_EBUS_EBUSVAR_H_ */