diff --git a/share/man/man4/options.4 b/share/man/man4/options.4 index a6691761dc63..8787ab153884 100644 --- a/share/man/man4/options.4 +++ b/share/man/man4/options.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.115 2000/08/03 00:34:08 jeffs Exp $ +.\" $NetBSD: options.4,v 1.116 2000/08/30 19:05:47 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 @@ -1490,6 +1490,18 @@ Ideally the probed defaults are satisfactory, however in practice 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 --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4 index 027f65d46380..8ff41c57b03d 100644 --- a/share/man/man4/pcmcia.4 +++ b/share/man/man4/pcmcia.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: pcmcia.4,v 1.17 2000/07/24 11:58:31 ad Exp $ +.\" $NetBSD: pcmcia.4,v 1.18 2000/08/30 19:05:47 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 @@ -145,12 +145,17 @@ driver appeared in .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 @@ -165,3 +170,12 @@ Example: 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 . \ No newline at end of file