cleanup deafult locators (blah ?); please check that your most hated architecture is still fluffy (;

6 files changed, 111 insertions, 111 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 457aed5a323..1c25b83e4ac 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.75 2004/03/09 15:24:27 miod Exp $
+#	$OpenBSD: GENERIC,v 1.76 2004/09/16 09:14:04 mickey Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -97,9 +97,9 @@ zs1	at obio0 addr 0xf0000000 level 12		# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12		# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12		# sun4/300
 
-zstty* at zs? channel ?
-zskbd* at zs? channel ?
-wskbd* at zskbd? console ?
+zstty* at zs?
+zskbd* at zs?
+wskbd* at zskbd?
 
 # Magma serial/parallel port devices
 magma*	at sbus?					# magma serial cards
@@ -189,13 +189,13 @@ xdc0	at vmel0 addr 0xffffee80 level 3 vect 0x44
 xdc1	at vmel0 addr 0xffffee90 level 3 vect 0x45
 xdc2	at vmel0 addr 0xffffeea0 level 3 vect 0x46
 xdc3	at vmel0 addr 0xffffeeb0 level 3 vect 0x47
-xd*	at xdc? drive ?
+xd*	at xdc?
 
 # Xylogics 451 or 451 VME SMD disk controllers and disks, found
 # on sun4 systems.
 xyc0	at vmes0 addr 0xffffee40 level 3 vect 0x48
 xyc1	at vmes0 addr 0xffffee48 level 3 vect 0x49
-xy*	at xyc? drive ?
+xy*	at xyc?
 
 # NCR5380-based "Sun SCSI 3" VME SCSI controller.
 # This driver has several flags which may be enabled by OR'ing
@@ -304,27 +304,27 @@ tctrl0	at obio0
 
 # Sun PCMCIA bridge
 stp*	at sbus?
-pcmcia*	at stp? socket ?
+pcmcia*	at stp?
 
 # PCMCIA controller found on Tadpole SPARCbook
 tslot*	at sbus?
-pcmcia*	at tslot? socket ?
+pcmcia*	at tslot?
 
 # PCMCIA devices
-wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11DS
-#an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
-ne*	at pcmcia? function ?			# NE2000-compat ethernet
-ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-#com*	at pcmcia? function ?			# PCMCIA modems/serial ports
+wi*	at pcmcia?		# WaveLAN IEEE 802.11DS
+#an*	at pcmcia?		# Aironet IEEE 802.11DS
+ne*	at pcmcia?		# NE2000-compat ethernet
+ep*	at pcmcia?		# PCMCIA based 3C5xx ethernet
+#com*	at pcmcia?		# PCMCIA modems/serial ports
 
 # Media Independent Interface (mii) drivers (required by hme, ne, ep)
-bmtphy*	at mii? phy ?				# Broadcom 10/100 PHYs
-lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-nsphyter* at mii? phy ?
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
-tqphy* at mii? phy ?				# TDK 78Q212x PHYs
-ukphy*	at mii? phy ?
+bmtphy*	at mii?			# Broadcom 10/100 PHYs
+lxtphy*	at mii?			# Level1 LXT970 PHYs
+nsphy*	at mii?			# NS and compatible PHYs
+nsphyter* at mii?
+qsphy*	at mii?			# Quality Semi QS6612 PHYs
+tqphy* at mii?			# TDK 78Q212x PHYs
+ukphy*	at mii?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
@@ -335,12 +335,12 @@ scsibus* at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-ss*	at scsibus? target ? lun ?		# SCSI scanners
-uk*	at scsibus? target ? lun ?		# unknown SCSI devices
+sd*	at scsibus?		# SCSI disks
+st*	at scsibus?		# SCSI tapes
+cd*	at scsibus?		# SCSI CD-ROMs
+ch*	at scsibus?		# SCSI changer devices
+ss*	at scsibus?		# SCSI scanners
+uk*	at scsibus?		# unknown SCSI devices
 
 # Floppy controller and drive found on SPARCstations.
 fdc0	at mainbus0				# sun4c controller
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index f121b7bf61b..0a2aef0b5ff 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISK,v 1.51 2004/03/12 06:04:01 deraadt Exp $
+# 	$OpenBSD: RAMDISK,v 1.52 2004/09/16 09:14:04 mickey Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -109,9 +109,9 @@ zs1	at obio0 addr 0xf0000000 level 12		# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12		# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12		# sun4/300
 
-zstty* at zs? channel ?
-zskbd* at zs? channel ?
-wskbd* at zskbd? console ?
+zstty* at zs?
+zskbd* at zs?
+wskbd* at zskbd?
 
 # SUNW,xbox SBus Expansion Subsystem
 xbox*	at sbus?					# SBus Expansion box
@@ -173,8 +173,8 @@ ie4	at vmes0 addr 0xff2dff02 level 5 vect 0x7c
 # HappyMeal ethernet
 hme*	at sbus?
 # Media Independent Interface (mii) drivers (required for hme)
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
+nsphy*	at mii?				# NS and compatible PHYs
+qsphy*	at mii?				# Quality Semi QS6612 PHYs
 
 # Quad-ethernet glue device, and sub-devices
 qec*	at sbus?
@@ -187,28 +187,28 @@ xdc0	at vmel0 addr 0xffffee80 level 3 vect 0x44
 xdc1	at vmel0 addr 0xffffee90 level 3 vect 0x45
 xdc2	at vmel0 addr 0xffffeea0 level 3 vect 0x46
 xdc3	at vmel0 addr 0xffffeeb0 level 3 vect 0x47
-xd*	at xdc? drive ?
+xd*	at xdc?
 
 # Xylogics 451 or 451 VME SMD disk controllers and disks, found
 # on sun4 systems.
 xyc0	at vmes0 addr 0xffffee40 level 3 vect 0x48
 xyc1	at vmes0 addr 0xffffee48 level 3 vect 0x49
-xy*	at xyc? drive ?
+xy*	at xyc?
 
 # Sun PCMCIA bridge
 #stp*	at sbus?
-#pcmcia* at stp? socket ?
+#pcmcia* at stp?
 
 # PCMCIA controller found on Tadpole SPARCbook
 #tslot*	at sbus?
-#pcmcia* at tslot? socket ?
+#pcmcia* at tslot?
 
 # PCMCIA devices
-#wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11DS
-#an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
-#ne*	at pcmcia? function ?			# NE2000-compat ethernet
-#ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-#com*	at pcmcia? function ?			# PCMCIA modems/serial ports
+#wi*	at pcmcia?		# WaveLAN IEEE 802.11DS
+#an*	at pcmcia?		# Aironet IEEE 802.11DS
+#ne*	at pcmcia?		# NE2000-compat ethernet
+#ep*	at pcmcia?		# PCMCIA based 3C5xx ethernet
+#com*	at pcmcia?		# PCMCIA modems/serial ports
 
 # NCR5380-based "Sun SCSI 3" VME SCSI controller.
 # This driver has several flags which may be enabled by OR'ing
@@ -320,12 +320,12 @@ scsibus* at sw?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-#ss*	at scsibus? target ? lun ?		# SCSI scanners
-#uk*	at scsibus? target ? lun ?		# unknown SCSI devices
+sd*	at scsibus?		# SCSI disks
+st*	at scsibus?		# SCSI tapes
+cd*	at scsibus?		# SCSI CD-ROMs
+ch*	at scsibus?		# SCSI changer devices
+#ss*	at scsibus?		# SCSI scanners
+#uk*	at scsibus?		# unknown SCSI devices
 
 # Floppy controller and drive found on SPARCstations.
 fdc0	at mainbus0				# sun4c controller
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index b13d7884bbd..bb7684d79b7 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4,v 1.28 2003/05/14 01:07:22 miod Exp $
+#	$OpenBSD: SUN4,v 1.29 2004/09/16 09:14:04 mickey Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -60,9 +60,9 @@ zs1	at obio0 addr 0xf0000000 level 12		# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12		# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12		# sun4/300
 
-zstty* at zs? channel ?
-zskbd* at zs? channel ?
-wskbd* at zskbd? console ?
+zstty* at zs?
+zskbd* at zs?
+wskbd* at zskbd?
 
 #
 # Note the flags on the esp entries below, that work around
@@ -99,13 +99,13 @@ xdc0	at vmel0 addr 0xffffee80 level 3 vect 0x44
 xdc1	at vmel0 addr 0xffffee90 level 3 vect 0x45
 xdc2	at vmel0 addr 0xffffeea0 level 3 vect 0x46
 xdc3	at vmel0 addr 0xffffeeb0 level 3 vect 0x47
-xd*	at xdc? drive ?
+xd*	at xdc?
 
 # Xylogics 451 or 451 VME SMD disk controllers and disks, found
 # on sun4 systems.
 xyc0	at vmes0 addr 0xffffee40 level 3 vect 0x48
 xyc1	at vmes0 addr 0xffffee48 level 3 vect 0x49
-xy*	at xyc? drive ?
+xy*	at xyc?
 
 # NCR5380-based "Sun SCSI 3" VME SCSI controller.
 # This driver has several flags which may be enabled by OR'ing
@@ -163,12 +163,12 @@ scsibus* at sw?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-ss*	at scsibus? target ? lun ?		# SCSI scanners
-uk*	at scsibus? target ? lun ?		# unknown SCSI devices
+sd*	at scsibus?		# SCSI disks
+st*	at scsibus?		# SCSI tapes
+cd*	at scsibus?		# SCSI CD-ROMs
+ch*	at scsibus?		# SCSI changer devices
+ss*	at scsibus?		# SCSI scanners
+uk*	at scsibus?		# unknown SCSI devices
 
 #pseudo-device	strip	1	# radio clock
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 01d82483f85..9f4d85477a4 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.49 2004/05/09 22:08:04 miod Exp $
+#	$OpenBSD: SUN4C,v 1.50 2004/09/16 09:14:04 mickey Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -49,9 +49,9 @@ timer0	at mainbus0				# sun4c
 zs0	at mainbus0					# sun4c
 zs1	at mainbus0					# sun4c
 
-zstty* at zs? channel ?
-zskbd* at zs? channel ?
-wskbd* at zskbd? console ?
+zstty* at zs?
+zskbd* at zs?
+wskbd* at zskbd?
 
 # Magma serial/parallel port devices
 magma*	at sbus?					# magma serial cards
@@ -144,22 +144,22 @@ wsdisplay* at rfx?
 
 # Sun PCMCIA bridge
 stp*	at sbus?
-pcmcia*	at stp? socket ?
+pcmcia*	at stp?
 
 # PCMCIA devices
-wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11DS
-#an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
-ne*	at pcmcia? function ?			# NE2000-compat ethernet
-ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-#com*	at pcmcia? function ?			# PCMCIA modems/serial ports
+wi*	at pcmcia?		# WaveLAN IEEE 802.11DS
+#an*	at pcmcia?		# Aironet IEEE 802.11DS
+ne*	at pcmcia?		# NE2000-compat ethernet
+ep*	at pcmcia?		# PCMCIA based 3C5xx ethernet
+#com*	at pcmcia?		# PCMCIA modems/serial ports
 
 # Media Independent Interface (mii) drivers (required by ne and ep)
-bmtphy*	at mii? phy ?				# Broadcom 10/100 PHYs
-lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
-nsphy* at mii? phy ?				# NS and compatible PHYs
-nsphyter* at mii? phy ?
-tqphy* at mii? phy ?				# TDK 78Q212x PHYs
-ukphy*	at mii? phy ?
+bmtphy*	at mii?			# Broadcom 10/100 PHYs
+lxtphy*	at mii?			# Level1 LXT970 PHYs
+nsphy* at mii?			# NS and compatible PHYs
+nsphyter* at mii?
+tqphy* at mii?			# TDK 78Q212x PHYs
+ukphy*	at mii?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
@@ -168,12 +168,12 @@ scsibus* at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-ss*	at scsibus? target ? lun ?		# SCSI scanners
-uk*	at scsibus? target ? lun ?		# unknown SCSI devices
+sd*	at scsibus?		# SCSI disks
+st*	at scsibus?		# SCSI tapes
+cd*	at scsibus?		# SCSI CD-ROMs
+ch*	at scsibus?		# SCSI changer devices
+ss*	at scsibus?		# SCSI scanners
+uk*	at scsibus?		# unknown SCSI devices
 
 # Floppy controller and drive found on SPARCstations.
 fdc0	at mainbus0				# sun4c controller
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index d1373748112..fd2f6d4e0a8 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.62 2004/05/09 22:08:04 miod Exp $
+#	$OpenBSD: SUN4M,v 1.63 2004/09/16 09:14:04 mickey Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -62,9 +62,9 @@ led0	at obio0				# sun4m
 zs0	at obio0					# sun4m
 zs1	at obio0					# sun4m
 
-zstty* at zs? channel ?
-zskbd* at zs? channel ?
-wskbd* at zskbd? console ?
+zstty* at zs?
+zskbd* at zs?
+wskbd* at zskbd?
 
 # Magma serial/parallel port devices
 magma*	at sbus?					# magma serial cards
@@ -194,27 +194,27 @@ tctrl0	at obio0
 
 # Sun PCMCIA bridge
 stp*	at sbus?
-pcmcia*	at stp? socket ?
+pcmcia*	at stp?
 
 # PCMCIA controller found on Tadpole SPARCbook
 tslot*	at sbus?
-pcmcia*	at tslot? socket ?
+pcmcia*	at tslot?
 
 # PCMCIA devices
-wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11DS
-#an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
-ne*	at pcmcia? function ?			# NE2000-compat ethernet
-ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-#com*	at pcmcia? function ?			# PCMCIA modems/serial ports
+wi*	at pcmcia?		# WaveLAN IEEE 802.11DS
+#an*	at pcmcia?		# Aironet IEEE 802.11DS
+ne*	at pcmcia?		# NE2000-compat ethernet
+ep*	at pcmcia?		# PCMCIA based 3C5xx ethernet
+#com*	at pcmcia?		# PCMCIA modems/serial ports
 
 # Media Independent Interface (mii) drivers (required by hme, ne, ep)
-bmtphy*	at mii? phy ?				# Broadcom 10/100 PHYs
-lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-nsphyter* at mii? phy ?
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
-tqphy*	at mii? phy ?				# TDK 78Q212x PHYs
-ukphy*	at mii? phy ?
+bmtphy*	at mii?			# Broadcom 10/100 PHYs
+lxtphy*	at mii?			# Level1 LXT970 PHYs
+nsphy*	at mii?			# NS and compatible PHYs
+nsphyter* at mii? 
+qsphy*	at mii?			# Quality Semi QS6612 PHYs
+tqphy*	at mii?			# TDK 78Q212x PHYs
+ukphy*	at mii? 
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
@@ -223,15 +223,15 @@ scsibus* at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-ss*	at scsibus? target ? lun ?		# SCSI scanners
-uk*	at scsibus? target ? lun ?		# unknown SCSI devices
+sd*	at scsibus?		# SCSI disks
+st*	at scsibus?		# SCSI tapes
+cd*	at scsibus?		# SCSI CD-ROMs
+ch*	at scsibus?		# SCSI changer devices
+ss*	at scsibus?		# SCSI scanners
+uk*	at scsibus?		# unknown SCSI devices
 
 # Floppy controller and drive found on SPARCstations.
-fdc0	at obio0				# sun4m controller
-fd*	at fdc0					# the drive itself
+fdc0	at obio0		# sun4m controller
+fd*	at fdc0			# the drive itself
 
 #pseudo-device	strip	1	# radio clock
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 8789795020e..e8798d4f82f 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.59 2004/02/29 21:44:12 miod Exp $
+#	$OpenBSD: files.sparc,v 1.60 2004/09/16 09:14:04 mickey Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -61,7 +61,7 @@ device memreg
 attach memreg at mainbus, obio
 file	arch/sparc/sparc/memreg.c
 
-device zs { channel = -1 }
+device zs {[channel = -1]}
 attach zs at mainbus, obio
 file	arch/sparc/dev/zs.c			zs needs-flag
 file	arch/sparc/dev/z8530sc.c		zs
@@ -239,14 +239,14 @@ file	arch/sparc/dev/if_le.c		le
 attach ie at obio, vmes, vmel
 file	arch/sparc/dev/if_ie.c		ie
 
-device xdc {drive = -1}
+device xdc {[drive = -1]}
 attach xdc at vmel
 device xd: disk
 attach xd at xdc
 file	arch/sparc/dev/xd.c		xd needs-flag
 major	{xd = 10}
 
-device xyc {drive = -1}
+device xyc {[drive = -1]}
 attach xyc at vmes
 device xy: disk
 attach xy at xyc