Rename bus_translate_address_generic => bus_space_translate_address_generic()
and move prototype to <machine/bus.h>.
This commit is contained in:
parent
736c085516
commit
a24d586ab2
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: autoconf.h,v 1.38 2004/06/27 18:24:46 pk Exp $ */
|
||||
/* $NetBSD: autoconf.h,v 1.39 2004/06/28 10:14:13 pk Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
|
||||
@ -184,6 +184,3 @@ void mountroot_hook_establish __P((void (*) __P((struct device *)),
|
||||
void bootstrap __P((void));
|
||||
struct device *getdevunit __P((char *, int));
|
||||
int romgetcursoraddr __P((int **, int **));
|
||||
|
||||
int bus_translate_address_generic(struct openprom_range *, int,
|
||||
bus_addr_t *);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bus.h,v 1.41 2004/06/27 18:24:46 pk Exp $ */
|
||||
/* $NetBSD: bus.h,v 1.42 2004/06/28 10:14:13 pk Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
|
||||
@ -191,6 +191,9 @@ struct sparc_bus_space_tag {
|
||||
u_int64_t value));
|
||||
};
|
||||
|
||||
int bus_space_translate_address_generic(struct openprom_range *, int,
|
||||
bus_addr_t *);
|
||||
|
||||
/*
|
||||
* Bus space function prototypes.
|
||||
* In bus_space_map2(), supply a special virtual address only if you
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: machdep.c,v 1.249 2004/06/27 18:24:46 pk Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.250 2004/06/28 10:14:13 pk Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
@ -78,7 +78,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.249 2004/06/27 18:24:46 pk Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.250 2004/06/28 10:14:13 pk Exp $");
|
||||
|
||||
#include "opt_compat_netbsd.h"
|
||||
#include "opt_compat_sunos.h"
|
||||
@ -2141,7 +2141,7 @@ static void sparc_bus_barrier __P(( bus_space_tag_t, bus_space_handle_t,
|
||||
* Generic routine to translate an address using OpenPROM `ranges'.
|
||||
*/
|
||||
int
|
||||
bus_translate_address_generic(struct openprom_range *ranges, int nranges,
|
||||
bus_space_translate_address_generic(struct openprom_range *ranges, int nranges,
|
||||
bus_addr_t *bap)
|
||||
{
|
||||
int i, space = BUS_ADDR_IOSPACE(*bap);
|
||||
@ -2187,7 +2187,7 @@ static vaddr_t iobase;
|
||||
if (t->ranges != NULL) {
|
||||
int error;
|
||||
|
||||
if ((error = bus_translate_address_generic(
|
||||
if ((error = bus_space_translate_address_generic(
|
||||
t->ranges, t->nranges, &ba)) != 0)
|
||||
return (error);
|
||||
}
|
||||
@ -2276,7 +2276,7 @@ sparc_bus_mmap(t, ba, off, prot, flags)
|
||||
if (t->ranges != NULL) {
|
||||
int error;
|
||||
|
||||
if ((error = bus_translate_address_generic(
|
||||
if ((error = bus_space_translate_address_generic(
|
||||
t->ranges, t->nranges, &ba)) != 0)
|
||||
return (-1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user