Completely overhault attachment rules on sgi. No more indirect configuration

inherited from OpenBSD/arc machines with ISA bus; mainbus children match on
device name and other hierarchies match on simplified locators.
As a bonus, attachment lines in dmesg will now print their locators.

ok jsing@

3 files changed, 18 insertions, 26 deletions

diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC
index 9f012f731b3..e296c984d14 100644
--- a/sys/arch/sgi/conf/GENERIC
+++ b/sys/arch/sgi/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.27 2008/01/06 06:08:01 jsing Exp $
+#	$OpenBSD: GENERIC,v 1.28 2008/02/20 18:46:20 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -19,8 +19,6 @@ makeoption	LINK_ADDRESS="0xffffffff80100000"
 # MD options
 option		ARCBIOS		# We use arcbios for FW communication.
 
-#option		APERTURE
-
 option	WSDISPLAY_COMPAT_RAWKBD	# Provide raw scancodes; needed for X11
 
 option		PCIVERBOSE
@@ -50,12 +48,12 @@ gbe0		at mainbus0
 
 # Localbus devices
 clock0		at macebus0
-mec0		at macebus0 sys 0x18 base 0x00280000 irq 4
-mavb0		at macebus0 sys 0x18 base 0x00300000 irq 7
-mkbc0		at macebus0 sys 0x18 base 0x00320000 irq 6
-com0		at macebus0 sys 0x18 base 0x00390000 irq 5
-com1		at macebus0 sys 0x18 base 0x00398000 irq 5
-power0		at macebus0 sys 0x18 irq 6
+mec0		at macebus0 base 0x00280000 irq 4
+mavb0		at macebus0 base 0x00300000 irq 7
+mkbc0		at macebus0 base 0x00320000 irq 6
+com0		at macebus0 base 0x00390000 irq 5
+com1		at macebus0 base 0x00398000 irq 5
+power0		at macebus0 irq 6
 
 #### PCI Bus
 macepcibr0	at macebus0	# MACE controller PCI Bus bridge.
diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK
index 927ca0682ab..e432ceb51e2 100644
--- a/sys/arch/sgi/conf/RAMDISK
+++ b/sys/arch/sgi/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.16 2008/01/06 21:36:08 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.17 2008/02/20 18:46:20 miod Exp $
 #
 
 machine		sgi mips64
@@ -51,12 +51,11 @@ macebus0	at mainbus0	# MACE controller localbus.
 gbe0		at mainbus0
 
 #### Localbus devices
-
 clock0		at macebus0
-mec0		at macebus0 sys 0x18 base 0x00280000 irq 4
-mkbc0		at macebus0 sys 0x18 base 0x00320000 irq 6
-com0		at macebus0 sys 0x18 base 0x00390000 irq 5
-com1		at macebus0 sys 0x18 base 0x00398000 irq 5
+mec0		at macebus0 base 0x00280000 irq 4
+mkbc0		at macebus0 base 0x00320000 irq 6
+com0		at macebus0 base 0x00390000 irq 5
+com1		at macebus0 base 0x00398000 irq 5
 
 #### PCI Bus
 macepcibr0	at macebus0	# MACE controller PCI Bus bridge.
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index bc321bafa9e..db69ad4d95b 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sgi,v 1.19 2007/12/31 12:46:14 jsing Exp $
+#	$OpenBSD: files.sgi,v 1.20 2008/02/20 18:46:20 miod Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -12,6 +12,7 @@ file	arch/sgi/sgi/disksubr.c			disk
 file	arch/sgi/sgi/autoconf.c
 file	arch/sgi/sgi/bus_dma.c
 file	arch/sgi/sgi/conf.c
+file	arch/sgi/sgi/ip30_machdep.c		tgt_octane
 file	arch/sgi/sgi/machdep.c
 file	arch/sgi/sgi/mutex.c
 file	arch/sgi/sgi/sginode.c			tgt_origin200 | tgt_origin2000
@@ -43,7 +44,7 @@ attach	cpu at mainbus
 #
 #	O2 MACE localbus autoconfiguration devices
 #
-define	macebus {[sys = - 1], [base = -1], [irq = -1]}
+define	macebus {[base = -1], [irq = -1]}
 device	macebus
 attach	macebus at mainbus
 file	arch/sgi/localbus/macebus.c		macebus
@@ -80,8 +81,7 @@ include	"dev/pci/files.pci"
 
 # Clock device
 device	clock
-attach	clock at macebus with clock_macebus
-attach	clock at xbowmux with clock_xbowmux
+attach	clock at macebus
 file	arch/sgi/sgi/clock_md.c			clock
 
 # GBE framebuffer
@@ -90,13 +90,8 @@ attach	gbe at mainbus
 file	arch/sgi/dev/gbe.c			gbe	needs-flag
 
 # 16[45]50-based "com" ports on localbus
-attach	com at xbowmux with com_xbow
-attach	com at macebus with com_localbus
-file	arch/sgi/localbus/com_lbus.c		com_localbus | com_xbow
-
-# PC parallel ports (XXX what chip?)
-attach	lpt at macebus with lpt_localbus
-file	arch/sgi/dev/lpt_lbus.c			lpt_localbus
+attach	com at macebus with com_macebus
+file	arch/sgi/localbus/com_lbus.c		com_macebus
 
 # MACE MAC-110 ethernet
 device	mec: ether, ifnet, ifmedia, mii