[src/trunk]: src/sys/dev/isapnp Enable workaround for isapnp assigning alread...

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

details:   https://anonhg.NetBSD.org/src/rev/80719fa71fc4
branches:  trunk
changeset: 471830:80719fa71fc4
user:      mjl <mjl%NetBSD.org@localhost>
date:      Mon Apr 12 19:31:27 1999 +0000

description:
Enable workaround for isapnp assigning already used interrupts to pnp
cards by masking them out with a "options ISAPNP_ALLOC_INTR_MASK=..."
in kernel config.

diffstat:

 sys/dev/isapnp/isapnp.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 8aa2a7573074 -r 80719fa71fc4 sys/dev/isapnp/isapnp.c
--- a/sys/dev/isapnp/isapnp.c   Mon Apr 12 18:01:36 1999 +0000
+++ b/sys/dev/isapnp/isapnp.c   Mon Apr 12 19:31:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isapnp.c,v 1.33 1999/03/22 09:38:58 mycroft Exp $      */
+/*     $NetBSD: isapnp.c,v 1.34 1999/04/12 19:31:27 mjl Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -57,6 +57,10 @@
 
 #include "wss_isapnp.h"                /* XXX part of disgusting CS chip hack */
 
+#ifndef ISAPNP_ALLOC_INTR_MASK
+#define ISAPNP_ALLOC_INTR_MASK (~0)
+#endif
+
 static void isapnp_init __P((struct isapnp_softc *));
 static __inline u_char isapnp_shift_bit __P((struct isapnp_softc *));
 static int isapnp_findcard __P((struct isapnp_softc *));
@@ -259,7 +263,8 @@
                return 0;
        }
 
-       if (isa_intr_alloc(ic, i->bits, i->type, &irq) == 0) {
+       if (isa_intr_alloc(ic, ISAPNP_ALLOC_INTR_MASK & i->bits,
+                          i->type, &irq) == 0) {
                i->num = irq;
                return 0;
        }