summaryrefslogtreecommitdiff
path: root/sys/arch/sun2/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2006-10-01 03:53:27 +0000
committertsutsui <tsutsui@NetBSD.org>2006-10-01 03:53:27 +0000
commitd23b794c9e66f9658ff694c6c19eb7ed65e07523 (patch)
tree1ec19358d585ef897d7e4d1f84468295d812a1b6 /sys/arch/sun2/dev
parent51cc6c40414eaeeb6ac35911eef48bebb97f33d5 (diff)
First attempt at bus_space(9) support for sun3 with common sun68k/bus.c:
- make sun3 port use common sun68k files as much as possible - add temporary options _SUN2_ in std.sun2 until sun3 can share all sun68k files (autoconf.c and isr.c are not yet) - move sun68kvme declaration temporary as well from files.sun68k to files.sun2 - rename and move sun68k_find_prom_map() function to MD sources since it can't be shared with sun3 - add bus tag members to struct confargs and initilize them where appropriate XXX1: MD bus_dma(9) backends are not implemented (yet). XXX2: more code (obio etc.) should be shared among sun3, sun3x and sun2.
Diffstat (limited to 'sys/arch/sun2/dev')
-rw-r--r--sys/arch/sun2/dev/zs_any.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/arch/sun2/dev/zs_any.c b/sys/arch/sun2/dev/zs_any.c
index e98fcc7bfe2..d5e94f87462 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.14 2006/03/28 17:38:28 thorpej Exp $ */
+/* $NetBSD: zs_any.c,v 1.15 2006/10/01 03:53:27 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.14 2006/03/28 17:38:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_any.c,v 1.15 2006/10/01 03:53:27 tsutsui Exp $");
#include "opt_kgdb.h"
@@ -180,9 +180,6 @@ zs_console_flags(int promunit, int node, int channel)
}
#ifdef KGDB
-extern int sun68k_find_prom_map(bus_addr_t, bus_type_t, int,
- bus_space_handle_t *);
-
/*
* Find a zs mapped by the PROM. Currently this only works to find
* zs0 on obio.
@@ -200,7 +197,7 @@ zs_find_prom(int unit)
* The physical address of zs0 is model-dependent.
*/
zs0_phys = (cpu_machine_id == ID_SUN2_120 ? 0x002000 : 0x7f2000);
- if (sun68k_find_prom_map(zs0_phys, PMAP_OBIO, sizeof(struct zsdevice),
+ if (find_prom_map(zs0_phys, PMAP_OBIO, sizeof(struct zsdevice),
&bh))
return (NULL);