Attachment glue for stp and tslot drivers, and add them, as well as wi0,

to the appropriate configuration files.

4 files changed, 49 insertions, 7 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index a34b9308bbb..8c64a64590c 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.69 2003/06/18 17:40:31 miod Exp $
+#	$OpenBSD: GENERIC,v 1.70 2003/06/23 09:30:36 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -298,9 +298,20 @@ wsdisplay* at agten?
 mgx* at sbus?
 wsdisplay* at mgx?
 
-# Microcontroller found on Tadpole
+# Microcontroller found on Tadpole SPARCbook
 tctrl0	at obio0
 
+# Sun PCMCIA bridge
+stp*	at sbus?
+pcmcia*	at stp? socket ?
+
+# PCMCIA controller found on Tadpole SPARCbook
+tslot*	at sbus?
+pcmcia*	at tslot? socket ?
+
+# PCMCIA devices
+wi*	at pcmcia? function ?
+
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
 scsibus* at esp?
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index bfc6052ae36..c7e53636de5 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.44 2003/05/14 06:39:49 miod Exp $
+#	$OpenBSD: SUN4C,v 1.45 2003/06/23 09:30:36 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -137,6 +137,13 @@ wsdisplay* at agten?
 mgx* at sbus?
 wsdisplay* at mgx?
 
+# Sun PCMCIA bridge
+stp*	at sbus?
+pcmcia*	at stp? socket ?
+
+# PCMCIA devices
+wi*	at pcmcia? function ?
+
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
 scsibus* at esp?
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 0e9ed2ead90..af517d1c7b5 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.54 2003/06/18 17:40:31 miod Exp $
+#	$OpenBSD: SUN4M,v 1.55 2003/06/23 09:30:36 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -181,8 +181,19 @@ wsdisplay* at agten?
 mgx* at sbus?
 wsdisplay* at mgx?
 
-# Microcontroller found on Tadpole
-tctrl0  at obio0
+# Microcontroller found on Tadpole SPARCbook
+tctrl0	at obio0
+
+# Sun PCMCIA bridge
+stp*	at sbus?
+pcmcia*	at stp? socket ?
+
+# PCMCIA controller found on Tadpole SPARCbook
+tslot*	at sbus?
+pcmcia*	at tslot? socket ?
+
+# PCMCIA devices
+wi*	at pcmcia? function ?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 9ec73651536..4b328e694be 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.56 2003/06/18 17:40:31 miod Exp $
+#	$OpenBSD: files.sparc,v 1.57 2003/06/23 09:30: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
@@ -373,3 +373,16 @@ file	arch/sparc/dev/tctrl.c		tctrl needs-flag
 device	presto: disk
 attach	presto at sbus
 file	arch/sparc/dev/presto.c		presto needs-flag
+
+# PCMCIA devices
+
+device	tslot: pcmciabus
+attach	tslot at sbus
+file	arch/sparc/dev/ts102.c		tslot
+
+device	stp: pcmciabus
+attach	stp at sbus with stp_sbus
+file	dev/sbus/stp4020.c		stp
+file	arch/sparc/dev/stp_sbus.c	stp_sbus
+
+include	"dev/pcmcia/files.pcmcia"