Document tslot(4), and the availability of stp(4) on sparc now.

4 files changed, 87 insertions, 10 deletions

diff --git a/share/man/man4/man4.sparc/Makefile b/share/man/man4/man4.sparc/Makefile
index 74b9eeb93dd..afd1da5849b 100644
--- a/share/man/man4/man4.sparc/Makefile
+++ b/share/man/man4/man4.sparc/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.37 2003/06/20 03:49:16 jason Exp $
+#	$OpenBSD: Makefile,v 1.38 2003/06/23 09:34:53 miod Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
 MAN=	agten.4 audioamd.4 audiocs.4 autoconf.4 auxreg.4 be.4 bpp.4 bwtwo.4 \
 	cgtwo.4 cgthree.4 cgfour.4 cgsix.4 cgeight.4 cgtwelve.4 cgfourteen.4 \
 	daadio.4 esp.4 fd.4 fga.4 ie.4 intro.4 le.4 led.4 magma.4 mem.4 \
 	mgx.4 openprom.4 pninek.4 pnozz.4 presto.4 qe.4 qec.4 scf.4 si.4 \
-	spif.4 sw.4 tctrl.4 tcx.4 tvtwo.4 vigra.4 xbox.4 xd.4 xy.4 zs.4 \
-	zx.4
+	spif.4 sw.4 tctrl.4 tcx.4 tslot.4 tvtwo.4 vigra.4 xbox.4 xd.4 \
+	xy.4 zs.4 zx.4
 MLINKS=	fd.4 fdc.4 \
 	fga.4 fvme.4 \
 	le.4 lebuffer.4 le.4 ledma.4 \
diff --git a/share/man/man4/man4.sparc/tctrl.4 b/share/man/man4/man4.sparc/tctrl.4
index 5e33bb7061b..7cf62ab154a 100644
--- a/share/man/man4/man4.sparc/tctrl.4
+++ b/share/man/man4/man4.sparc/tctrl.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: tctrl.4,v 1.5 2003/06/18 17:40:31 miod Exp $
+.\"     $OpenBSD: tctrl.4,v 1.6 2003/06/23 09:34:53 miod Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 8, 1999
+.Dd June 22, 2003
 .Dt TCTRL 4 sparc
 .Os
 .Sh NAME
@@ -34,8 +34,10 @@
 .Cd "tctrl0 at obio0"
 .Sh DESCRIPTION
 The
-.Nm tctrl
-provides control over many functions on the Tadpole SPARCbook 3 series laptops.
+.Nm
+driver provides control over many functions on the
+.Tn Tadpole SPARCbook
+3 series laptops, via their TS102 chip.
 The microcontroller is used to power the TFT display down when the
 laptop lid is closed and when the screen is blanked by the
 .Xr pninek 4
@@ -49,8 +51,12 @@ is also used to power the laptop off when the
 system call is used with the
 .Ar RB_POWERDOWN
 flag is set.
+The PCMCIA part of the controller is managed by the
+.Xr tslot 4
+driver.
 .Sh SEE ALSO
 .Xr reboot 2 ,
 .Xr intro 4 ,
 .Xr pninek 4 ,
-.Xr pnozz 4
+.Xr pnozz 4 ,
+.Xr tslot 4
diff --git a/share/man/man4/man4.sparc/tslot.4 b/share/man/man4/man4.sparc/tslot.4
new file mode 100644
index 00000000000..23a06765ad9
--- /dev/null
+++ b/share/man/man4/man4.sparc/tslot.4
@@ -0,0 +1,62 @@
+.\"	$OpenBSD: tslot.4,v 1.1 2003/06/23 09:34:53 miod Exp $
+.\"
+.\" Copyright (c) 2003, Miodrag Vallat.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd June 22, 2003
+.Dt TSLOT 4 sparc
+.Os
+.Sh NAME
+.Nm tslot
+.Nd Tadpole PCMCIA Controller
+.Sh SYNOPSIS
+.Cd "tslot0 at sbus? slot ? offset ?"
+.Cd "pcmcia* at tslot? socket ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver manages the
+.Xr pcmcia 4
+controller part of the
+.Xr tctrl 4
+.Tn Tadpole
+TS102 controller found on the
+.Tn Tadpole SPARCbook
+3 series laptops.
+It provides two PCMCIA slots and can receive up to two PCMCIA type 1
+or type 2 cards, or one PCMCIA type 3 card.
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr pcmcia 4 ,
+.Xr sbus 4 ,
+.Xr tctrl 4
+.Sh CAVEATS
+Due to hardware limitations, it is not possible to run a 3.3V card and a 5V
+card at the same time.
+.Sh BUGS
+Unlike other PCMCIA adapters which are little-endian, this bridge
+provides a big-endian
+.Xr pcmcia 4
+bus.
+Therefore, 16 bit drivers need to be made aware of this before they will
+work.
diff --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4
index 2a3065e0280..bf132f74eae 100644
--- a/share/man/man4/pcmcia.4
+++ b/share/man/man4/pcmcia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcmcia.4,v 1.32 2003/06/19 20:29:51 deraadt Exp $
+.\"	$OpenBSD: pcmcia.4,v 1.33 2003/06/23 09:34:50 miod Exp $
 .\"	$NetBSD: pcmcia.4,v 1.4 1998/06/07 09:10:30 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -51,7 +51,11 @@
 .Cd "tcic0   at isa? port 0x240 iomem 0xd0000 iosiz 0x10000"
 .Cd "pcmcia* at tcic? controller ? socket ?"
 .Pp
-.Cd "# sparc64"
+.Cd "# sparc"
+.Cd "tslot*  at sbus? slot ? offset ?"
+.Cd "pcmcia* at tslot? socket ?"
+.Pp
+.Cd "# sparc/sparc64"
 .Cd "stp*    at sbus? slot ? offset ?"
 .Cd "pcmcia* at stp? socket ?"
 .Pp
@@ -163,6 +167,7 @@ device may need to be decreased to avoid a conflict.
 .Xr an 4 ,
 .Xr awi 4 ,
 .Xr cardbus 4 ,
+.Xr cbb 4 ,
 .Xr cnw 4 ,
 .Xr com 4 ,
 .Xr eisa 4 ,
@@ -173,10 +178,14 @@ device may need to be decreased to avoid a conflict.
 .Xr isapnp 4 ,
 .Xr ne 4 ,
 .Xr pci 4 ,
+.Xr pcic 4 ,
 .Xr ray 4 ,
 .Xr rln 4 ,
 .Xr sbus 4 ,
 .Xr sm 4 ,
+.Xr stp 4 ,
+.Xr tcic 4 ,
+.Xr tslot 4 ,
 .Xr usb 4 ,
 .Xr wdc 4 ,
 .Xr wi 4 ,