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

configuration lines.

1 files changed, 22 insertions, 22 deletions

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