[src/netbsd-1-5]: src/share/man/man4 Pullup options.4 rev 1.116, pcmcia.4 rev...

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ea619b354cac
branches:  netbsd-1-5
changeset: 489346:ea619b354cac
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Fri Sep 01 16:14:44 2000 +0000

description:
Pullup options.4 rev 1.116, pcmcia.4 rev 1.18, approved by thorpej:
  Document PCIC_ISA_INTR_ALLOC_MASK; documentation is now up-to-par with
  the info in distrib/notes.

  Minor fixup on PCIC_ISA_ALLOC_IO*.

diffstat:

 share/man/man4/options.4 |  16 ++++++++++++++--
 share/man/man4/pcmcia.4  |  24 +++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diffs (89 lines):

diff -r 4ba925d83c9c -r ea619b354cac share/man/man4/options.4
--- a/share/man/man4/options.4  Fri Sep 01 14:22:41 2000 +0000
+++ b/share/man/man4/options.4  Fri Sep 01 16:14:44 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: options.4,v 1.109.2.2 2000/07/25 23:08:15 is Exp $
+.\"    $NetBSD: options.4,v 1.109.2.3 2000/09/01 16:14:44 jhawk Exp $
 .\"
 .\" Copyright (c) 1996
 .\"    Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd April 13, 2000
+.Dd August 29, 2000
 .Os
 .Dt OPTIONS 4
 .Sh NAME
@@ -1479,6 +1479,18 @@
 that is not always the case. See
 .Xr pcmcia 4
 for details.
+.It Cd options PCIC_ISA_INTR_ALLOC_MASK=mask
+Controls the allowable interrupts that may be used for
+.Tn PCMCIA
+devices. This mask is a logical-or of power-of-2s of allowable
+interrupts:
+.Bd -literal -offset 04n
+.Em "IRQ Val      IRQ Val      IRQ Val       IRQ Val"
+ 0  0x0001    4  0x0010    8  0x0100    12  0x1000
+ 1  0x0002    5  0x0020    9  0x0200    13  0x2000
+ 2  0x0004    6  0x0040   10  0x0400    14  0x4000
+ 3  0x0008    7  0x0080   11  0x0800    15  0x8000
+.Ed
 .El
 .Ss m68k-specific Options
 .Bl -ohang
diff -r 4ba925d83c9c -r ea619b354cac share/man/man4/pcmcia.4
--- a/share/man/man4/pcmcia.4   Fri Sep 01 14:22:41 2000 +0000
+++ b/share/man/man4/pcmcia.4   Fri Sep 01 16:14:44 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pcmcia.4,v 1.16 2000/05/09 17:59:39 jhawk Exp $
+.\" $NetBSD: pcmcia.4,v 1.16.4.1 2000/09/01 16:14:44 jhawk Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 13, 2000
+.Dd August 29, 2000
 .Dt PCMCIA 4
 .Os
 .Sh NAME
@@ -141,12 +141,17 @@
 .Sh BUGS
 .Ss IO space conflicts
 .Nx 
-probes the pcmcia IO bus width and uses that information to decide
-where to map PCMCIA IO space. For 10-bit wide cards, 0x300-0x3ff is
+probes the
+.Tn PCMCIA
+IO bus width and uses that information to decide
+where to map
+.Tn PCMCIA
+IO space. For 10-bit wide cards, 0x300-0x3ff is
 used. For 12-bit wide cards, 0x400-0x4ff is used.
 .Pp
 Neither choice is perfect. In the 12-bit case, 0x400 appears to work
-on substantially more devices than 0x300. In the event that pcmcia
+on substantially more devices than 0x300. In the event that
+.Tn PCMCIA
 devices are mapped in 0x400-0xfff and appear to be nonfunctional,
 remapping to 0x300-0x3ff may be appropriate; consult
 .Cd options PCIC_ISA_ALLOC_IOBASE
@@ -161,3 +166,12 @@
 options PCIC_ISA_ALLOC_IOBASE=0x300
 options PCIC_ISA_ALLOC_IOSIZE=0x0ff
 .Ed
+.Ss Interrupt conflicts
+.Nx
+attempts to probe for available interrupts to assign to
+.Tn PCMCIA
+devices. In some cases, it is not possible to detect
+all interrupts in use; in such cases, use of
+.Cd options PCIC_ISA_INTR_ALLOC_MASK
+may be necessary. See
+.Xr options 4 .