Make the "slot" and "offset" locators for sbus drivers optional in

configuration lines.

5 files changed, 107 insertions, 107 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 252a82f6edc..0c73d56c3d4 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.63 2003/04/13 22:55:48 miod Exp $
+#	$OpenBSD: GENERIC,v 1.64 2003/05/13 17:24:10 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -42,10 +42,10 @@ sbus0	at iommu0				# sun4m
 
 audioamd0 at mainbus0				# sun4c
 audioamd0 at obio0				# sun4m
-audioamd0 at sbus0 slot ? offset ?		# sun4m
+audioamd0 at sbus0				# sun4m
 audio*	at audioamd?
 
-audiocs0 at sbus0 slot ? offset ?		# sun4m
+audiocs0 at sbus0				# sun4m
 audio*	at audiocs?
 
 auxreg0	at mainbus0				# sun4c
@@ -102,19 +102,19 @@ zskbd* at zs? channel ?
 wskbd* at zskbd? console ?
 
 # Magma serial/parallel port devices
-magma*	at sbus? slot ? offset ?			# magma serial cards
+magma*	at sbus?					# magma serial cards
 mtty*	at magma?
 mbpp*	at magma?
 
 # SUNW,spif serial/parallel port devices
-spif*	at sbus? slot ? offset ?			# spif serial cards
+spif*	at sbus?					# spif serial cards
 stty*	at spif?
 sbpp*	at spif?
 
-bpp*	at sbus? slot ? offset ?			# parallel port 
+bpp*	at sbus?					# parallel port 
 
 # SUNW,xbox SBus Expansion Subsystem
-xbox*	at sbus? slot ? offset ?			# SBus Expansion box
+xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
 
 #
@@ -135,33 +135,33 @@ esp0	at obio0 addr 0xfa000000 level 4 flags 0xff0f	#
 
 # sun4c or sun4m SCSI - an NCR53c94 or equivalent behind
 # specialized DMA glue
-dma0	at sbus0 slot ? offset ?			# on-board SCSI
-esp0	at sbus0 slot ? offset ? flags 0xff0f		# sun4c
+dma0	at sbus0					# on-board SCSI
+esp0	at sbus0 flags 0xff0f				# sun4c
 esp0	at dma0 flags 0xff0f				# sun4m
 
 # FSBE/S SCSI - an NCR53c94 or equivalent behind
-dma*	at sbus? slot ? offset ?			# SBus SCSI
-esp*	at sbus? slot ? offset ? flags 0xff0f		# two flavours
+dma*	at sbus?					# SBus SCSI
+esp*	at sbus? flags 0xff0f				# two flavours
 esp*	at dma? flags 0xff0f				# depending on model
 
 #sun4c, sun4m
-isp*	at sbus? slot ? offset ?
+isp*	at sbus?
 options ISP_COMPILE_1000_FW=1
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
-ledma0	at sbus0 slot ? offset ?			# sun4m on-board
+ledma0	at sbus0					# sun4m on-board
 le0	at ledma0					#
 
 # Additional SBus LANCE devices - glued on by lebuffer
-lebuffer0	at sbus0 slot ? offset ?		# sun4m SBus
-lebuffer*	at sbus? slot ? offset ?		# sun4m SBus
+lebuffer0	at sbus0				# sun4m SBus
+lebuffer*	at sbus?				# sun4m SBus
 le0	at lebuffer0					#
 le*	at lebuffer?					#
 
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
-le0	at sbus0 slot ? offset ?			# sun4c on-board
-le*	at sbus? slot ? offset ?
+le0	at sbus0					# sun4c on-board
+le*	at sbus?
 
 le0	at obio0 addr 0xf9000000 level 6		# sun4/300
 
@@ -176,13 +176,13 @@ ie3	at vmes0 addr 0xff35ff02 level 5 vect 0x77
 ie4	at vmes0 addr 0xff2dff02 level 5 vect 0x7c
 
 # HappyMeal ethernet (will not work on sun4c)
-hme*	at sbus? slot ? offset ?
+hme*	at sbus?
 # Media Independent Interface (mii) drivers (required by hme)
 nsphy*	at mii? phy ?				# NS and compatible PHYs
 qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
 
 # Quad-ethernet glue device, and sub-devices
-qec*	at sbus? slot ? offset ?
+qec*	at sbus?
 qe*	at qec?
 be*	at qec?
 
@@ -224,8 +224,8 @@ sw0	at obio0 addr 0x0a000000 level 3
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
 # systems.
-bwtwo0	at sbus0 slot ? offset ?		# sun4c on-board
-bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
+bwtwo0	at sbus0				# sun4c on-board
+bwtwo*	at sbus?				# sun4c and sun4m
 bwtwo0	at obio0 addr 0xfd000000 level 4	# sun4/200
 bwtwo0	at obio0 addr 0xfb300000 level 4	# sun4/300 in P4 slot
 bwtwo0	at obio0 addr 0x0b300000 level 4	# sun4/100 in P4 slot
@@ -236,7 +236,7 @@ cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
 wsdisplay* at cgtwo?
 
 # Sun "cgthree" Sbus color framebuffer.
-cgthree* at sbus? slot ? offset ?
+cgthree* at sbus?
 wsdisplay* at cgthree?
 
 # Sun "cgfour" color framebuffer.
@@ -245,8 +245,8 @@ cgfour0	at obio0 addr 0x0b300000 level 4	# sun4/100 P4
 wsdisplay* at cgfour?
 
 # Sun "cgsix" accelerated color framebuffer.
-cgsix0	at sbus? slot ? offset ?
-cgsix*	at sbus? slot ? offset ?
+cgsix0	at sbus?
+cgsix*	at sbus?
 cgsix0	at obio0 addr 0xfb000000 level 4	# sun4/300 P4
 cgsix0	at obio0 addr 0x0b000000 level 4	# sun4/100 P4
 wsdisplay* at cgsix?
@@ -257,7 +257,7 @@ cgeight0 at obio0 addr 0x0b300000 level 4	# sun4/100 P4
 wsdisplay* at cgeight?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx*	at sbus? slot ? offset ? flags 0x0000
+tcx*	at sbus? flags 0x0000
 wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
@@ -266,27 +266,27 @@ cgfourteen1 at obio0 addr 0x90000000 flags 0x0000	# sun4m
 wsdisplay* at cgfourteen?
 
 # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
-cgtwelve*	at sbus? slot ? offset ? flags 0x0000
+cgtwelve*	at sbus? flags 0x0000
 wsdisplay* at cgtwelve?
 
 # Sun "leo" (ZX) accelerated 24-bit framebuffer.
-zx*	at sbus? slot ? offset ?
+zx*	at sbus?
 wsdisplay* at zx?
 
 # Vigra VS10 or VS12 framebuffer.
-vigra*	at sbus? slot ? offset ?
+vigra*	at sbus?
 wsdisplay* at vigra?
 
 # Weitek p9100 found on Tadpole 3GS/3GX
-pnozz0	at sbus? slot ? offset ?
+pnozz0	at sbus?
 wsdisplay* at pnozz?
 
 # Parallax XVideo and PowerVideo
-tvtwo* at sbus? slot ? offset ?
+tvtwo* at sbus?
 wsdisplay* at tvtwo?
 
 # Fujitsu AG-10e framebuffer.
-agten* at sbus? slot ? offset ?
+agten* at sbus?
 wsdisplay* at agten?
 
 # Microcontroller found on Tadpole
@@ -321,6 +321,6 @@ fd*	at fdc0					# the drive itself
 #daadio*	at fvme? addr 0x0 level 1 vect 0x1f	# Matrix MD-DAADIO board
 
 # Prestoserve NVRAM
-#presto*	at sbus? slot ? offset ?
+#presto*	at sbus?
 
 #pseudo-device	strip	1	# radio clock
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index be28960919e..6989de60626 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISK,v 1.39 2003/03/09 22:41:54 miod Exp $
+# 	$OpenBSD: RAMDISK,v 1.40 2003/05/13 17:24:10 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -59,7 +59,7 @@ sbus0	at iommu0				# sun4m
 
 #audioamd0 at mainbus0				# sun4c
 #audioamd0 at obio0				# sun4m
-#audioamd0 at sbus0 slot ? offset ?		# sun4m
+#audioamd0 at sbus0				# sun4m
 #audio*	at audioamd?
 
 auxreg0	at mainbus0				# sun4c
@@ -112,7 +112,7 @@ zskbd* at zs? channel ?
 wskbd* at zskbd? console ?
 
 # SUNW,xbox SBus Expansion Subsystem
-xbox*	at sbus? slot ? offset ?			# SBus Expansion box
+xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
 
 #
@@ -133,28 +133,28 @@ esp0	at obio0 addr 0xfa000000 level 4 flags 0xff0f	#
 
 # sun4c or sun4m SCSI - an NCR53c94 or equivalent behind
 # specialized DMA glue
-dma0	at sbus0 slot ? offset ?			# on-board SCSI
-esp0	at sbus0 slot ? offset ? flags 0xff0f		# sun4c
+dma0	at sbus0					# on-board SCSI
+esp0	at sbus0 flags 0xff0f				# sun4c
 esp0	at dma0 flags 0xff0f				# sun4m
 
 # FSBE/S SCSI - an NCR53c94 or equivalent behind
-dma*	at sbus? slot ? offset ?			# SBus SCSI
-esp*	at sbus? slot ? offset ? flags 0xff0f		# two flavours
+dma*	at sbus?					# SBus SCSI
+esp*	at sbus? flags 0xff0f				# two flavours
 esp*	at dma? flags 0xff0f				# depending on model
 
 # sun4m Ethernet - an AMD 7990 LANCE behind specialized DMA glue
-ledma0	at sbus? slot ? offset ?			# sun4m on-board
+ledma0	at sbus?					# sun4m on-board
 le0	at ledma0					#
 
 # Additional SBus LANCE devices - glued on by lebuffer
-lebuffer0	at sbus0 slot ? offset ?		# sun4m SBus
-lebuffer*	at sbus? slot ? offset ?		# sun4m SBus
+lebuffer0	at sbus0				# sun4m SBus
+lebuffer*	at sbus?				# sun4m SBus
 le0	at lebuffer0					#
 le*	at lebuffer?					#
 
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
-le0	at sbus0 slot ? offset ?			# sun4c on-board
-le*	at sbus? slot ? offset ?
+le0	at sbus0					# sun4c on-board
+le*	at sbus?
 
 le0	at obio0 addr 0xf9000000 level 6		# sun4/300
 
@@ -169,13 +169,13 @@ ie3	at vmes0 addr 0xff35ff02 level 5 vect 0x77
 ie4	at vmes0 addr 0xff2dff02 level 5 vect 0x7c
 
 # HappyMeal ethernet
-hme*	at sbus? slot ? offset ?
+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
 
 # Quad-ethernet glue device, and sub-devices
-qec*	at sbus? slot ? offset ?
+qec*	at sbus?
 qe*	at qec?
 be*	at qec?
 
@@ -217,8 +217,8 @@ sw0	at obio0 addr 0x0a000000 level 3
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
 # systems.
-bwtwo0	at sbus0 slot ? offset ?		# sun4c on-board
-bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
+bwtwo0	at sbus0				# sun4c on-board
+bwtwo*	at sbus?				# sun4c and sun4m
 bwtwo0	at obio0 addr 0xfd000000 level 4	# sun4/200
 bwtwo0	at obio0 addr 0xfb300000 level 4	# sun4/300 in P4 slot
 bwtwo0	at obio0 addr 0x0b300000 level 4	# sun4/100 in P4 slot
@@ -229,7 +229,7 @@ cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
 wsdisplay* at cgtwo?
 
 # Sun "cgthree" Sbus color framebuffer.
-cgthree* at sbus? slot ? offset ?
+cgthree* at sbus?
 wsdisplay* at cgthree?
 
 # Sun "cgfour" color framebuffer.
@@ -238,8 +238,8 @@ cgfour0	at obio0 addr 0x0b300000 level 4	# sun4/100 P4
 wsdisplay* at cgfour?
 
 # Sun "cgsix" accelerated color framebuffer.
-cgsix0	at sbus? slot ? offset ?
-cgsix*	at sbus? slot ? offset ?
+cgsix0	at sbus?
+cgsix*	at sbus?
 cgsix0	at obio0 addr 0xfb000000 level 4	# sun4/300 P4
 cgsix0	at obio0 addr 0x0b000000 level 4	# sun4/100 P4
 wsdisplay* at cgsix?
@@ -250,7 +250,7 @@ cgeight0 at obio0 addr 0x0b300000 level 4	# sun4/100 P4
 wsdisplay* at cgeight?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx*	at sbus? slot ? offset ? flags 0x0001
+tcx*	at sbus? flags 0x0001
 wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
@@ -259,27 +259,27 @@ cgfourteen1 at obio0 addr 0x90000000 flags 0x0001	# sun4m
 wsdisplay* at cgfourteen?
 
 # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
-cgtwelve*	at sbus? slot ? offset ? flags 0x0001
+cgtwelve*	at sbus? flags 0x0001
 wsdisplay* at cgtwelve?
 
 # Sun "leo" (ZX) accelerated 24-bit framebuffer.
-zx*	at sbus? slot ? offset ?
+zx*	at sbus?
 wsdisplay* at zx?
 
 # Vigra VS10 or VS12 framebuffer.
-vigra*	at sbus? slot ? offset ?
+vigra*	at sbus?
 wsdisplay* at vigra?
 
 # Weitek p9100 found on Tadpole 3GS/3GX
-pnozz0	at sbus? slot ? offset ?
+pnozz0	at sbus?
 wsdisplay* at pnozz?
 
 # Parallax XVideo and PowerVideo
-tvtwo* at sbus? slot ? offset ?
+tvtwo* at sbus?
 wsdisplay* at tvtwo?
 
 # Fujitsu AG-10e framebuffer.
-agten* at sbus? slot ? offset ?
+agten* at sbus?
 wsdisplay* at agten?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 072b442d353..32191c50408 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.41 2003/03/10 20:50:38 miod Exp $
+#	$OpenBSD: SUN4C,v 1.42 2003/05/13 17:24:10 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -54,19 +54,19 @@ zskbd* at zs? channel ?
 wskbd* at zskbd? console ?
 
 # Magma serial/parallel port devices
-magma*	at sbus? slot ? offset ?			# magma serial cards
+magma*	at sbus?					# magma serial cards
 mtty*	at magma?
 mbpp*	at magma?
 
 # SUNW,spif serial/parallel port devices
-spif*	at sbus? slot ? offset ?			# spif serial cards
+spif*	at sbus?					# spif serial cards
 stty*	at spif?
 sbpp*	at spif?
 
-bpp*	at sbus? slot ? offset ?			# parallel port 
+bpp*	at sbus?					# parallel port 
 
 # SUNW,xbox SBus Expansion Subsystem
-xbox*	at sbus? slot ? offset ?			# SBus Expansion box
+xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
 
 #
@@ -82,55 +82,55 @@ sbus*	at xbox?
 
 # sun4c or sun4m SCSI - an NCR53c94 or equivalent behind
 # specialized DMA glue
-dma0	at sbus0 slot ? offset ?			# on-board SCSI
-esp0	at sbus0 slot ? offset ? flags 0xff0f		# sun4c
+dma0	at sbus0					# on-board SCSI
+esp0	at sbus0 flags 0xff0f				# sun4c
 
 # FSBE/S SCSI - an NCR53c94 or equivalent behind
-dma*	at sbus? slot ? offset ?			# SBus SCSI
-esp*	at sbus? slot ? offset ? flags 0xff0f		# two flavours
+dma*	at sbus?					# SBus SCSI
+esp*	at sbus? flags 0xff0f				# two flavours
 esp*	at dma? flags 0xff0f				# depending on model
 
 #sun4c, sun4m
-isp*	at sbus? slot ? offset ?
+isp*	at sbus?
 
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
-le0	at sbus0 slot ? offset ?			# sun4c on-board
-le*	at sbus? slot ? offset ?
+le0	at sbus0					# sun4c on-board
+le*	at sbus?
 
 # Quad-ethernet glue device, and sub-devices
-qec*	at sbus? slot ? offset ?
+qec*	at sbus?
 qe*	at qec?
 be*	at qec?
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
 # systems.
-bwtwo0	at sbus0 slot ? offset ?		# sun4c on-board
-bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
+bwtwo0	at sbus0					# sun4c on-board
+bwtwo*	at sbus?					# sun4c and sun4m
 wsdisplay* at bwtwo?
 
 # Sun "cgthree" Sbus color framebuffer.
-cgthree* at sbus? slot ? offset ?
+cgthree* at sbus?
 wsdisplay* at cgthree?
 
 # Sun "cgsix" accelerated color framebuffer.
-cgsix0	at sbus? slot ? offset ?
-cgsix*	at sbus? slot ? offset ?
+cgsix0	at sbus?
+cgsix*	at sbus?
 wsdisplay* at cgsix?
 
 # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
-cgtwelve*	at sbus? slot ? offset ? flags 0x0000
+cgtwelve*	at sbus? flags 0x0000
 wsdisplay* at cgtwelve?
 
 # Vigra VS10 or VS12 framebuffer.
-vigra*	at sbus? slot ? offset ?
+vigra*	at sbus?
 wsdisplay* at vigra?
 
 # Parallax XVideo and PowerVideo
-tvtwo* at sbus? slot ? offset ?
+tvtwo* at sbus?
 wsdisplay* at tvtwo?
 
 # Fujitsu AG-10e framebuffer.
-agten* at sbus? slot ? offset ?
+agten* at sbus?
 wsdisplay* at agten?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index c47efc11af0..c9db5677b05 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.48 2003/03/09 02:30:45 miod Exp $
+#	$OpenBSD: SUN4M,v 1.49 2003/05/13 17:24:10 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -34,10 +34,10 @@ iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
 audioamd0 at obio0				# sun4m
-audioamd0 at sbus0 slot ? offset ?		# sun4m
+audioamd0 at sbus0				# sun4m
 audio*	at audioamd?
 
-audiocs0 at sbus0 slot ? offset ?		# sun4m
+audiocs0 at sbus0				# sun4m
 audio*	at audiocs?
 
 auxreg0	at obio0				# sun4m
@@ -67,17 +67,17 @@ zskbd* at zs? channel ?
 wskbd* at zskbd? console ?
 
 # Magma serial/parallel port devices
-magma*	at sbus? slot ? offset ?			# magma serial cards
+magma*	at sbus?					# magma serial cards
 mtty*	at magma?
 mbpp*	at magma?
 
 # SUNW,spif serial/parallel port devices
-spif*	at sbus? slot ? offset ?			# spif serial cards
+spif*	at sbus?					# spif serial cards
 stty*	at spif?
 sbpp*	at spif?
 
 # SUNW,xbox SBus Expansion Subsystem
-xbox*	at sbus? slot ? offset ?			# SBus Expansion box
+xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
 
 #
@@ -93,54 +93,54 @@ sbus*	at xbox?
 
 # sun4c or sun4m SCSI - an NCR53c94 or equivalent behind
 # specialized DMA glue
-dma0	at sbus0 slot ? offset ?			# on-board SCSI
+dma0	at sbus0					# on-board SCSI
 esp0	at dma0 flags 0xff0f				# sun4m
 
 # FSBE/S SCSI - an NCR53c94 or equivalent behind
-dma*	at sbus? slot ? offset ?			# SBus SCSI
-esp*	at sbus? slot ? offset ? flags 0xff0f		# two flavours
+dma*	at sbus?					# SBus SCSI
+esp*	at sbus? flags 0xff0f				# two flavours
 esp*	at dma? flags 0xff0f				# depending on model
 
 #sun4c, sun4m
-isp*	at sbus? slot ? offset ?
+isp*	at sbus?
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
-ledma0	at sbus0 slot ? offset ?			# sun4m on-board
+ledma0	at sbus0					# sun4m on-board
 le0	at ledma0					#
 
 # Additional SBus LANCE devices - glued on by lebuffer
-lebuffer0	at sbus0 slot ? offset ?		# sun4m SBus
-lebuffer*	at sbus? slot ? offset ?		# sun4m SBus
+lebuffer0	at sbus0				# sun4m SBus
+lebuffer*	at sbus?				# sun4m SBus
 le0	at lebuffer0					#
 le*	at lebuffer?					#
 
 # HappyMeal ethernet
-hme*	at sbus? slot ? offset ?
+hme*	at sbus?
 # Media Independent Interface (mii) drivers (required by hme)
 nsphy*	at mii? phy ?				# NS and compatible PHYs
 qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
 
 # Quad-ethernet glue device, and sub-devices
-qec*	at sbus? slot ? offset ?
+qec*	at sbus?
 qe*	at qec?
 be*	at qec?
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
 # systems.
-bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
+bwtwo*	at sbus?				# sun4c and sun4m
 wsdisplay* at bwtwo?
 
 # Sun "cgthree" Sbus color framebuffer.
-cgthree* at sbus? slot ? offset ?
+cgthree* at sbus?
 wsdisplay* at cgthree?
 
 # Sun "cgsix" accelerated color framebuffer.
-cgsix*	at sbus? slot ? offset ?
+cgsix*	at sbus?
 wsdisplay* at cgsix?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx*	at sbus? slot ? offset ? flags 0x0000
+tcx*	at sbus? flags 0x0000
 wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
@@ -149,27 +149,27 @@ cgfourteen1 at obio0 addr 0x90000000 flags 0x0000	# sun4m
 wsdisplay* at cgfourteen?
 
 # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
-cgtwelve*	at sbus? slot ? offset ? flags 0x0000
+cgtwelve*	at sbus? flags 0x0000
 wsdisplay* at cgtwelve?
 
 # Sun "leo" (ZX) accelerated 24-bit framebuffer.
-zx*	at sbus? slot ? offset ?
+zx*	at sbus?
 wsdisplay* at zx?
 
 # Vigra VS10 or VS12 framebuffer.
-vigra*	at sbus? slot ? offset ?
+vigra*	at sbus?
 wsdisplay* at vigra?
 
 # Weitek p9100 found on Tadpole 3GS/3GX
-pnozz0	at sbus? slot ? offset ?
+pnozz0	at sbus?
 wsdisplay* at pnozz?
 
 # Parallax XVideo and PowerVideo
-tvtwo* at sbus? slot ? offset ?
+tvtwo* at sbus?
 wsdisplay* at tvtwo?
 
 # Fujitsu AG-10e framebuffer.
-agten* at sbus? slot ? offset ?
+agten* at sbus?
 wsdisplay* at agten?
 
 # Microcontroller found on Tadpole
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 88e554b3b35..19fddb6c766 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.51 2003/04/13 22:55:48 miod Exp $
+#	$OpenBSD: files.sparc,v 1.52 2003/05/13 17:24:10 miod Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -74,7 +74,7 @@ file	arch/sparc/dev/fd.c			fdc | fd needs-flag
 file	arch/sparc/sparc/bsd_fdintr.s		fdc
 
 device xbox {}
-device sbus { slot = -1, offset = -1 }
+device sbus { [slot = -1], [offset = -1] }
 attach sbus at mainbus, iommu, sbus, xbox
 file	arch/sparc/dev/sbus.c			sbus