summaryrefslogtreecommitdiff
path: root/sys/arch/sun2/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2006-10-03 13:02:32 +0000
committertsutsui <tsutsui@NetBSD.org>2006-10-03 13:02:32 +0000
commitc207dcd8805ccfce3dfb7fb8bb887e4d09651989 (patch)
tree1afe955eadc9560d2e28624b7c809844fbeca115 /sys/arch/sun2/dev
parentadb2b00a4a8cac5aa551d5a3659603717f73e23d (diff)
- change find_prom_map() to take paddr_t and return vaddr_t rather than
bus_space_handle_t since bus space handle without bus space tag looks weird - replace old sun3 obio_find_mapping() with new common find_prom_map() - add bus_space_vaddr(), from hp300
Diffstat (limited to 'sys/arch/sun2/dev')
-rw-r--r--sys/arch/sun2/dev/zs_any.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/sun2/dev/zs_any.c b/sys/arch/sun2/dev/zs_any.c
index d5e94f87462..a963fc9f604 100644
--- a/sys/arch/sun2/dev/zs_any.c
+++ b/sys/arch/sun2/dev/zs_any.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_any.c,v 1.15 2006/10/01 03:53:27 tsutsui Exp $ */
+/* $NetBSD: zs_any.c,v 1.16 2006/10/03 13:02:32 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_any.c,v 1.15 2006/10/01 03:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_any.c,v 1.16 2006/10/03 13:02:32 tsutsui Exp $");
#include "opt_kgdb.h"
@@ -188,7 +188,7 @@ void *
zs_find_prom(int unit)
{
bus_addr_t zs0_phys;
- bus_space_handle_t bh;
+ vaddr_t va;
if (unit != 0)
return (NULL);
@@ -197,10 +197,9 @@ zs_find_prom(int unit)
* The physical address of zs0 is model-dependent.
*/
zs0_phys = (cpu_machine_id == ID_SUN2_120 ? 0x002000 : 0x7f2000);
- if (find_prom_map(zs0_phys, PMAP_OBIO, sizeof(struct zsdevice),
- &bh))
+ if (find_prom_map(zs0_phys, PMAP_OBIO, sizeof(struct zsdevice), &va))
return (NULL);
- return (bh);
+ return (void *)va;
}
#endif /* KGDB */