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

configuration lines.

4 files changed, 42 insertions, 42 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index dbc53068c90..37de5320737 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.81 2003/05/01 23:34:03 jason Exp $
+#	$OpenBSD: GENERIC,v 1.82 2003/05/14 23:32:35 miod Exp $
 # 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
 
 machine		sparc64
@@ -94,7 +94,7 @@ ugen*	at uhub? port ? configuration ?		# USB generic device
 #### Standard system devices -- all required for a given architecture
 
 auxio*	at ebus?
-auxio*	at sbus? slot ? offset ?
+auxio*	at sbus?
 beeper*	at ebus?
 
 # SAB82532 based serial ports
@@ -122,9 +122,9 @@ lpt*	at ebus?
 
 # performance counters
 uperf*	at ebus?
-uperf*	at sbus? slot ? offset ?
+uperf*	at sbus?
 
-zs*	at sbus? slot ? offset ?
+zs*	at sbus?
 zstty*	at zs? channel ?
 zskbd*	at zs? channel ?
 wskbd*	at zskbd? console ?
@@ -133,7 +133,7 @@ wskbd*	at zskbd? console ?
 pcons0	at mainbus0				# PROM console
 
 ## Mostek/DS1287 clocks
-clock*	at sbus? slot ? offset ?
+clock*	at sbus?
 clock*	at ebus?
 rtc*	at ebus?
 
@@ -141,26 +141,26 @@ rtc*	at ebus?
 timer*	at mainbus0
 
 ## Lance Ethernet - AMD7990
-le*		at sbus? slot ? offset ?
-ledma*		at sbus? slot ? offset ?
+le*		at sbus?
+ledma*		at sbus?
 le*		at ledma?
-lebuffer*	at sbus? slot ? offset ?
+lebuffer*	at sbus?
 le*		at lebuffer?
 
 # Quad-ethernet glue device, and sub-devices
-qec*		at sbus? slot ? offset ?
+qec*		at sbus?
 qe*		at qec?
 be*		at qec?
 
-hme*		at sbus? slot ? offset ?
+hme*		at sbus?
 
 # Magma serial/parallel port devices
-magma*		at sbus? slot ? offset ?
+magma*		at sbus?
 mtty*		at magma?
 mbpp*		at magma?
 
 # Magma serial/parallel port devices
-spif*		at sbus? slot ? offset ?
+spif*		at sbus?
 stty*		at spif?
 sbpp*		at spif?
 
@@ -179,11 +179,11 @@ scsibus* at atapiscsi?
 #	      devices should be allowed to disconnect for the SCSI bus
 #	      to operate acceptably.
 #
-dma*	at sbus? slot ? offset ?		# SBus
+dma*	at sbus?				# SBus
 esp*	at dma? flags 0x0000			# SBus
-esp*	at sbus? slot ? offset ?
+esp*	at sbus?
 
-isp*	at sbus? slot ? offset ?
+isp*	at sbus?
 option ISP_COMPILE_1000_FW=1
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
@@ -212,23 +212,23 @@ inphy*	at mii? phy ?				# Intel 82555 PHYs
 lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
 ukphy*	at mii? phy ?				# Unknown PHYs
 
-bwtwo*		at sbus? slot ? offset ?	# bw2, sbus mono framebuffer
+bwtwo*		at sbus?			# bw2, sbus mono framebuffer
 wsdisplay*	at bwtwo?
 
-cgsix*		at sbus? slot ? offset ?	# cg6, sbus color framebuffer
+cgsix*		at sbus?			# cg6, sbus color framebuffer
 wsdisplay*	at cgsix?
 
-cgthree*	at sbus? slot ? offset ?	# cg3, sbus color framebuffer
+cgthree*	at sbus?			# cg3, sbus color framebuffer
 wsdisplay*	at cgthree?
 
-audiocs*	at sbus? slot ? offset ?
+audiocs*	at sbus?
 
-asio*		at sbus? slot ? offset ?	# Aurora 210SJ
+asio*		at sbus?			# Aurora 210SJ
 com*		at asio?
-apio*		at sbus? slot ? offset ?	# Aurora 210SJ
+apio*		at sbus?			# Aurora 210SJ
 lpt*		at apio?
 
-stp*		at sbus? slot ? offset ?	# STP4020
+stp*		at sbus?			# STP4020
 pcmcia*		at stp? socket ?
 #com*		at pcmcia? function ?		# PCMCIA modems/serial ports
 wi*		at pci? dev ? function ?	# WaveLAN IEEE 802.11DS
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 3eeaa290fcb..418a3e84a87 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISK,v 1.22 2003/05/13 22:45:11 miod Exp $
+# 	$OpenBSD: RAMDISK,v 1.23 2003/05/14 23:32:35 miod Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -47,9 +47,9 @@ gem*	at pci? dev ? function ?
 dc*	at pci? dev ? function ?
 
 auxio*	at ebus?
-auxio*	at sbus? slot ? offset ?
+auxio*	at sbus?
 #com*	at ebus?
-clock*	at sbus? slot ? offset ?		# Mostek clock 
+clock*	at sbus?				# Mostek clock 
 clock*	at ebus?
 rtc*	at ebus?				# DS1287/M5819 clock
 timer*	at mainbus0				# Timer chip
@@ -58,15 +58,15 @@ timer*	at mainbus0				# Timer chip
 pcons0	at mainbus0				# PROM console
 
 ## Lance Ethernet - AMD7990
-le*	at sbus? slot ? offset ?
-ledma*	at sbus? slot ? offset ?
+le*	at sbus?
+ledma*	at sbus?
 le*	at ledma?
 
 # Quad-ethernet glue device, and sub-devices
-qec*	at sbus? slot ? offset ?
+qec*	at sbus?
 qe*	at qec?
 be*	at qec?
-hme*	at sbus? slot ? offset ?
+hme*	at sbus?
 
 pciide*	at pci? dev ? function ? flags 0x0000
 wd*	at pciide? channel ? drive ? flags 0x0a00
@@ -83,10 +83,10 @@ scsibus* at atapiscsi?
 #	      devices should be allowed to disconnect for the SCSI bus
 #	      to operate acceptably.
 #
-dma*	at sbus? slot ? offset ?		# SBus
+dma*	at sbus?				# SBus
 esp*	at dma? flags 0x0000			# SBus
-esp*	at sbus? slot ? offset ?
-isp*	at sbus? slot ? offset ?
+esp*	at sbus?
+isp*	at sbus?
 option ISP_COMPILE_1000_FW=1
 scsibus* at esp?
 
diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1
index c57d0a9fced..f07bb6992d0 100644
--- a/sys/arch/sparc64/conf/RAMDISKU1
+++ b/sys/arch/sparc64/conf/RAMDISKU1
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISKU1,v 1.4 2003/05/13 22:45:11 miod Exp $
+# 	$OpenBSD: RAMDISKU1,v 1.5 2003/05/14 23:32:35 miod Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -36,21 +36,21 @@ cpu0	at mainbus0
 # Bus types found on SPARC systems.
 sbus0	at mainbus0				# Ultra 1
 
-clock*	at sbus? slot ? offset ?		# Mostek clock 
+clock*	at sbus?				# Mostek clock 
 timer*	at mainbus0				# Timer chip
 
 ## PROM console driver -- if all else fails
 pcons0	at mainbus0				# PROM console
 
-le*	at sbus? slot ? offset ?	# Lance Ethernet - AMD7990
-ledma*	at sbus? slot ? offset ?
+le*	at sbus?				# Lance Ethernet - AMD7990
+ledma*	at sbus?
 le*	at ledma?
 
-#qec*	at sbus? slot ? offset ?	# Quad-ethernet
+#qec*	at sbus?				# Quad-ethernet
 #qe*	at qec?
 #be*	at qec?
 
-hme*		at sbus? slot ? offset ?
+hme*		at sbus?
 
 #
 # Note the flags on the esp entries below, that work around
@@ -62,9 +62,9 @@ hme*		at sbus? slot ? offset ?
 #	      devices should be allowed to disconnect for the SCSI bus
 #	      to operate acceptably.
 #
-dma*	at sbus? slot ? offset ?		# SBus
+dma*	at sbus?				# SBus
 esp*	at dma? flags 0x0000			# SBus
-esp*	at sbus? slot ? offset ?
+esp*	at sbus?
 scsibus*	at esp?
 
 # These entries find devices on all SCSI busses and assign
diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index d4f4cf4ae72..acf51678012 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,10 +1,10 @@
-#	$OpenBSD: files.sbus,v 1.21 2002/06/20 03:51:52 fgsch Exp $
+#	$OpenBSD: files.sbus,v 1.22 2003/05/14 23:32:36 miod Exp $
 #	$NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
 
-device	sbus { slot = -1, offset = -1 }
+device	sbus { [slot = -1], [offset = -1] }
 #notyet:file	dev/sbus/sbus.c			sbus
 
 # Sbus NCR539x SCSI & Lance Ethernet