Allow more than one auxio device to attach, and attach both SPARCbook auxio

registers. However, those are handled specifically since they do not have
the same meaning as the regular sun4c/sun4m auxio register.

A specific auxregbisc() function is provided for explicit sparcbook operation.

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index bad6c5112ec..d56e7005322 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.82 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.83 2005/07/08 12:36:36 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -52,8 +52,8 @@ audio*	at audioamd?
 audiocs0 at sbus0				# sun4m
 audio*	at audiocs?
 
-auxreg0	at mainbus0				# sun4c
-auxreg0	at obio0				# sun4m
+auxreg*	at mainbus0				# sun4c
+auxreg*	at obio0				# sun4m
 
 # Power status and control register found on Sun4m systems
 power0	at obio0
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index 8de8a6629e9..10667ced5b8 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.55 2005/05/01 07:54:42 david Exp $
+#	$OpenBSD: RAMDISK,v 1.56 2005/07/08 12:36:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -64,8 +64,8 @@ sbus0	at iommu0				# sun4m
 #audioamd0 at sbus0				# sun4m
 #audio*	at audioamd?
 
-auxreg0	at mainbus0				# sun4c
-auxreg0	at obio0				# sun4m
+auxreg*	at mainbus0				# sun4c
+auxreg*	at obio0				# sun4m
 
 # Power status and control register found on Sun4m systems
 power0	at obio0
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 09cb4bc94af..7989278104b 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.52 2005/05/01 07:54:42 david Exp $
+#	$OpenBSD: SUN4C,v 1.53 2005/07/08 12:36:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -32,7 +32,7 @@ sbus0	at mainbus0				# sun4c
 audioamd0 at mainbus0				# sun4c
 audio*	at audioamd?
 
-auxreg0	at mainbus0				# sun4c
+auxreg*	at mainbus0				# sun4c
 
 # Mostek clock found on 4/300, sun4c, and sun4m systems.
 # The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 3ffdd558103..f2d78ba7433 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.67 2005/05/01 07:54:42 david Exp $
+#	$OpenBSD: SUN4M,v 1.68 2005/07/08 12:36:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -40,7 +40,7 @@ audio*	at audioamd?
 audiocs0 at sbus0				# sun4m
 audio*	at audiocs?
 
-auxreg0	at obio0				# sun4m
+auxreg*	at obio0				# sun4m
 
 # Power status and control register found on Sun4m systems
 power0	at obio0
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 708250a6a7f..4b01ee5618d 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.67 2005/05/03 00:39:39 brad Exp $
+#	$OpenBSD: files.sparc,v 1.68 2005/07/08 12:36:36 miod Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -30,7 +30,7 @@ file	arch/sparc/dev/obio.c		(obio | vmel | vmes | vme) & !solbourne
 
 device	auxreg
 attach	auxreg at mainbus, obio
-file	arch/sparc/sparc/auxreg.c		auxreg needs-count
+file	arch/sparc/sparc/auxreg.c		auxreg needs-flag
 
 device	clock
 attach	clock at mainbus, obio